Regenerate designer files after changes in last commit

restores previous default values after default changes in 7414aea850
This commit is contained in:
Morilli 2024-06-27 02:07:19 +02:00
parent 7414aea850
commit 2860a0189c
13 changed files with 1043 additions and 1021 deletions

View File

@ -30,7 +30,7 @@ namespace BizHawk.Client.EmuHawk
/// </summary>
private void InitializeComponent()
{
this.menuStrip1 = new MenuStripEx();
this.menuStrip1 = new BizHawk.WinForms.Controls.MenuStripEx();
this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.NewMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.OpenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -41,18 +41,18 @@ namespace BizHawk.Client.EmuHawk
this.noneToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.miAutoStart = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.miAutoSave = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.miAutoResume = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.toolStripSeparator2 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.ClearMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.DisassembleMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.toolStrip1 = new ToolStripEx();
this.toolStrip1 = new BizHawk.WinForms.Controls.ToolStripEx();
this.tsbLoggingActive = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.tsbViewUpdate = new System.Windows.Forms.ToolStripButton();
this.tsbViewStyle = new System.Windows.Forms.ToolStripComboBox();
this.toolStripSeparator4 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.tsbExportText = new System.Windows.Forms.ToolStripButton();
this.lvCDL = new InputRoll();
this.miAutoResume = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.lvCDL = new BizHawk.Client.EmuHawk.InputRoll();
this.menuStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
@ -132,6 +132,11 @@ namespace BizHawk.Client.EmuHawk
this.miAutoSave.Text = "Auto-Save";
this.miAutoSave.Click += new System.EventHandler(this.MiAutoSave_Click);
//
// miAutoResume
//
this.miAutoResume.Text = "Auto-Resume";
this.miAutoResume.Click += new System.EventHandler(this.MiAutoResume_Click);
//
// ClearMenuItem
//
this.ClearMenuItem.Text = "&Clear";
@ -161,7 +166,7 @@ namespace BizHawk.Client.EmuHawk
this.tsbLoggingActive.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.tsbLoggingActive.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbLoggingActive.Name = "tsbLoggingActive";
this.tsbLoggingActive.Size = new System.Drawing.Size(41, 22);
this.tsbLoggingActive.Size = new System.Drawing.Size(44, 22);
this.tsbLoggingActive.Text = "Active";
this.tsbLoggingActive.CheckedChanged += new System.EventHandler(this.TsbLoggingActive_CheckedChanged);
//
@ -173,7 +178,7 @@ namespace BizHawk.Client.EmuHawk
this.tsbViewUpdate.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.tsbViewUpdate.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbViewUpdate.Name = "tsbViewUpdate";
this.tsbViewUpdate.Size = new System.Drawing.Size(46, 22);
this.tsbViewUpdate.Size = new System.Drawing.Size(49, 22);
this.tsbViewUpdate.Text = "Update";
//
// tsbViewStyle
@ -191,29 +196,30 @@ namespace BizHawk.Client.EmuHawk
//
this.tsbExportText.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbExportText.Name = "tsbExportText";
this.tsbExportText.Size = new System.Drawing.Size(87, 22);
this.tsbExportText.Size = new System.Drawing.Size(78, 22);
this.tsbExportText.Text = "To Clipboard";
this.tsbExportText.Click += new System.EventHandler(this.TsbExportText_Click);
//
// lvCDL
//
this.lvCDL.CellWidthPadding = 3;
this.lvCDL.Dock = System.Windows.Forms.DockStyle.Fill;
this.lvCDL.FullRowSelect = true;
this.lvCDL.GridLines = true;
this.lvCDL.RowCount = 0;
this.lvCDL.Location = new System.Drawing.Point(0, 49);
this.lvCDL.Name = "lvCDL";
this.lvCDL.Size = new System.Drawing.Size(992, 323);
this.lvCDL.TabIndex = 9;
this.lvCDL.AllowColumnReorder = false;
this.lvCDL.AllowColumnResize = true;
this.lvCDL.QueryItemText += new InputRoll.QueryItemTextHandler(this.LvCDL_QueryItemText);
//
// miAutoResume
//
this.miAutoResume.Text = "Auto-Resume";
this.miAutoResume.Click += new System.EventHandler(this.MiAutoResume_Click);
this.lvCDL.AllowMassNavigationShortcuts = true;
this.lvCDL.AllowRightClickSelection = true;
this.lvCDL.AlwaysScroll = false;
this.lvCDL.CellHeightPadding = 0;
this.lvCDL.Dock = System.Windows.Forms.DockStyle.Fill;
this.lvCDL.FullRowSelect = true;
this.lvCDL.HorizontalOrientation = false;
this.lvCDL.LetKeysModifySelection = false;
this.lvCDL.Location = new System.Drawing.Point(0, 49);
this.lvCDL.Name = "lvCDL";
this.lvCDL.RowCount = 0;
this.lvCDL.ScrollSpeed = 0;
this.lvCDL.SeekingCutoffInterval = 0;
this.lvCDL.Size = new System.Drawing.Size(992, 323);
this.lvCDL.TabIndex = 9;
this.lvCDL.QueryItemText += new BizHawk.Client.EmuHawk.InputRoll.QueryItemTextHandler(this.LvCDL_QueryItemText);
//
// CDL
//

View File

@ -31,13 +31,13 @@ namespace BizHawk.Client.EmuHawk
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.CheatListView = new InputRoll();
this.CheatListView = new BizHawk.Client.EmuHawk.InputRoll();
this.CheatsContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.ToggleContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.RemoveContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.DisableAllContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.ViewInHexEditorContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.CheatsMenu = new MenuStripEx();
this.CheatsMenu = new BizHawk.WinForms.Controls.MenuStripEx();
this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.NewMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.OpenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -62,7 +62,7 @@ namespace BizHawk.Client.EmuHawk
this.AlwaysLoadCheatsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.AutoSaveCheatsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.DisableCheatsOnLoadMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.toolStrip1 = new ToolStripEx();
this.toolStrip1 = new BizHawk.WinForms.Controls.ToolStripEx();
this.NewToolBarItem = new System.Windows.Forms.ToolStripButton();
this.OpenToolBarItem = new System.Windows.Forms.ToolStripButton();
this.SaveToolBarItem = new System.Windows.Forms.ToolStripButton();
@ -86,20 +86,25 @@ namespace BizHawk.Client.EmuHawk
//
// CheatListView
//
this.CheatListView.CellWidthPadding = 3;
this.CheatListView.AllowColumnReorder = true;
this.CheatListView.AllowColumnResize = true;
this.CheatListView.MultiSelect = true;
this.CheatListView.AllowDrop = true;
this.CheatListView.AllowMassNavigationShortcuts = true;
this.CheatListView.AllowRightClickSelection = true;
this.CheatListView.AlwaysScroll = false;
this.CheatListView.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.CheatListView.CellHeightPadding = 0;
this.CheatListView.ContextMenuStrip = this.CheatsContextMenu;
this.CheatListView.FullRowSelect = true;
this.CheatListView.GridLines = true;
this.CheatListView.RowCount = 0;
this.CheatListView.HorizontalOrientation = false;
this.CheatListView.LetKeysModifySelection = false;
this.CheatListView.Location = new System.Drawing.Point(12, 72);
this.CheatListView.Name = "CheatListView";
this.CheatListView.RowCount = 0;
this.CheatListView.ScrollSpeed = 0;
this.CheatListView.SeekingCutoffInterval = 0;
this.CheatListView.Size = new System.Drawing.Size(414, 321);
this.CheatListView.TabIndex = 1;
this.CheatListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.CheatListView_ColumnClick);
@ -117,7 +122,7 @@ namespace BizHawk.Client.EmuHawk
this.DisableAllContextMenuItem,
this.ViewInHexEditorContextMenuItem});
this.CheatsContextMenu.Name = "contextMenuStrip1";
this.CheatsContextMenu.Size = new System.Drawing.Size(170, 92);
this.CheatsContextMenu.Size = new System.Drawing.Size(171, 92);
this.CheatsContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.CheatsContextMenu_Opening);
//
// ToggleContextMenuItem
@ -247,15 +252,15 @@ namespace BizHawk.Client.EmuHawk
//
// ToggleMenuItem
//
this.ToggleMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Enter)));
this.ToggleMenuItem.ShortcutKeyDisplayString = "Ctrl + Enter";
this.ToggleMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Return)));
this.ToggleMenuItem.Text = "&Toggle";
this.ToggleMenuItem.Click += new System.EventHandler(this.ToggleMenuItem_Click);
//
// DisableAllCheatsMenuItem
//
this.DisableAllCheatsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Back)));
this.DisableAllCheatsMenuItem.ShortcutKeyDisplayString = "Ctrl + Backspace";
this.DisableAllCheatsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Back)));
this.DisableAllCheatsMenuItem.Text = "Disable all";
this.DisableAllCheatsMenuItem.Click += new System.EventHandler(this.DisableAllCheatsMenuItem_Click);
//
@ -374,7 +379,7 @@ namespace BizHawk.Client.EmuHawk
this.LoadGameGenieToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.LoadGameGenieToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.LoadGameGenieToolbarItem.Name = "LoadGameGenieToolbarItem";
this.LoadGameGenieToolbarItem.Size = new System.Drawing.Size(75, 22);
this.LoadGameGenieToolbarItem.Size = new System.Drawing.Size(94, 22);
this.LoadGameGenieToolbarItem.Text = "Code Converter";
this.LoadGameGenieToolbarItem.ToolTipText = "Open the Cheat Code Converter";
this.LoadGameGenieToolbarItem.Click += new System.EventHandler(this.OpenGameGenieEncoderDecoderMenuItem_Click);

View File

@ -208,7 +208,6 @@ namespace BizHawk.Client.EmuHawk
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.DisassemblerView.CellHeightPadding = 0;
this.DisassemblerView.ChangeSelectionWhenPaging = true;
this.DisassemblerView.ContextMenuStrip = this.DisassemblerContextMenu;
this.DisassemblerView.Font = new System.Drawing.Font("Courier New", 8F);
this.DisassemblerView.FullRowSelect = true;

View File

@ -142,23 +142,18 @@
//
this.BranchView.AllowColumnReorder = false;
this.BranchView.AllowColumnResize = false;
this.BranchView.AllowMassNavigationShortcuts = true;
this.BranchView.AllowRightClickSelection = true;
this.BranchView.AlwaysScroll = false;
this.BranchView.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.BranchView.CellWidthPadding = 3;
this.BranchView.CellHeightPadding = 0;
this.BranchView.ChangeSelectionWhenPaging = false;
this.BranchView.ContextMenuStrip = this.BranchesContextMenu;
this.BranchView.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.BranchView.FullRowSelect = true;
this.BranchView.GridLines = true;
this.BranchView.HorizontalOrientation = false;
this.BranchView.LetKeysModifySelection = false;
this.BranchView.Location = new System.Drawing.Point(6, 19);
this.BranchView.MultiSelect = true;
this.BranchView.Name = "BranchView";
this.BranchView.RowCount = 0;
this.BranchView.ScrollSpeed = 1;

View File

@ -123,4 +123,7 @@
<metadata name="BranchesContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>23, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>185, 17</value>
</metadata>
</root>

View File

@ -62,7 +62,7 @@
this.toolStripSeparator1,
this.RemoveMarkerToolStripMenuItem});
this.MarkerContextMenu.Name = "MarkerContextMenu";
this.MarkerContextMenu.Size = new System.Drawing.Size(119, 120);
this.MarkerContextMenu.Size = new System.Drawing.Size(196, 142);
this.MarkerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MarkerContextMenu_Opening);
//
// JumpToMarkerToolStripMenuItem
@ -181,14 +181,11 @@
//
this.MarkerView.AllowColumnReorder = false;
this.MarkerView.AllowColumnResize = false;
this.MarkerView.AllowMassNavigationShortcuts = true;
this.MarkerView.AllowRightClickSelection = true;
this.MarkerView.AlwaysScroll = false;
this.MarkerView.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.MarkerView.CellHeightPadding = 0;
this.MarkerView.ChangeSelectionWhenPaging = true;
this.MarkerView.ContextMenuStrip = this.MarkerContextMenu;
this.MarkerView.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.MarkerView.FullRowSelect = true;

View File

@ -123,4 +123,7 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>168, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>168, 17</value>
</metadata>
</root>

View File

@ -31,7 +31,7 @@ namespace BizHawk.Client.EmuHawk
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.TASMenu = new MenuStripEx();
this.TASMenu = new BizHawk.WinForms.Controls.MenuStripEx();
this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.NewTASMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.NewFromSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -83,6 +83,7 @@ namespace BizHawk.Client.EmuHawk
this.SetMaxUndoLevelsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SetBranchCellHoverIntervalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SetSeekingCutoffIntervalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.CopyIncludesFrameNoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.toolStripSeparator26 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.autosaveToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SetAutosaveIntervalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -112,6 +113,7 @@ namespace BizHawk.Client.EmuHawk
this.customPatternToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.setpToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.setCustomsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SetFontMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.MetaSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.HeaderMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.StateHistorySettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -129,11 +131,11 @@ namespace BizHawk.Client.EmuHawk
this.toolStripSeparator12 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.hideWasLagFramesToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.iconsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.ColorSettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.DenoteStatesWithIconsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.DenoteStatesWithBGColorToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.DenoteMarkersWithIconsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.DenoteMarkersWithBGColorToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.ColorSettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.toolStripSeparator23 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.followCursorToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.alwaysScrollToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -153,7 +155,7 @@ namespace BizHawk.Client.EmuHawk
this.toolStripSeparator10 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.EnableTooltipsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.TasView = new BizHawk.Client.EmuHawk.InputRoll();
this.TasStatusStrip = new StatusStripEx();
this.TasStatusStrip = new BizHawk.WinForms.Controls.StatusStripEx();
this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.ProgressBar = new System.Windows.Forms.ToolStripProgressBar();
this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
@ -191,8 +193,6 @@ namespace BizHawk.Client.EmuHawk
this.BookMarkControl = new BizHawk.Client.EmuHawk.BookmarksBranchesBox();
this.BranchesMarkersSplit = new System.Windows.Forms.SplitContainer();
this.MainVertialSplit = new System.Windows.Forms.SplitContainer();
this.SetFontMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.CopyIncludesFrameNoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.TASMenu.SuspendLayout();
this.TasStatusStrip.SuspendLayout();
this.RightClickMenu.SuspendLayout();
@ -523,6 +523,11 @@ namespace BizHawk.Client.EmuHawk
this.SetSeekingCutoffIntervalMenuItem.Visible = false;
this.SetSeekingCutoffIntervalMenuItem.Click += new System.EventHandler(this.SetSeekingCutoffIntervalMenuItem_Click);
//
// CopyIncludesFrameNoMenuItem
//
this.CopyIncludesFrameNoMenuItem.Text = "Include Frame No. When Copying Row(s)";
this.CopyIncludesFrameNoMenuItem.Click += new System.EventHandler(this.CopyIncludesFrameNoMenuItem_Click);
//
// autosaveToolStripMenuItem
//
this.autosaveToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -659,6 +664,11 @@ namespace BizHawk.Client.EmuHawk
this.setCustomsToolStripMenuItem.Text = "Set Customs...";
this.setCustomsToolStripMenuItem.Click += new System.EventHandler(this.SetCustomsMenuItem_Click);
//
// SetFontMenuItem
//
this.SetFontMenuItem.Text = "Set Font";
this.SetFontMenuItem.Click += new System.EventHandler(this.SetFontMenuItem_Click);
//
// MetaSubMenu
//
this.MetaSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -771,11 +781,6 @@ namespace BizHawk.Client.EmuHawk
this.iconsToolStripMenuItem.Text = "Icons";
this.iconsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.IconsMenuItem_DropDownOpened);
//
// ColorSettingsMenuItem
//
this.ColorSettingsMenuItem.Text = "Edit TAStudio Colors...";
this.ColorSettingsMenuItem.Click += new System.EventHandler(this.ColorSettingsMenuItem_Click);
//
// DenoteStatesWithIconsToolStripMenuItem
//
this.DenoteStatesWithIconsToolStripMenuItem.CheckOnClick = true;
@ -800,6 +805,11 @@ namespace BizHawk.Client.EmuHawk
this.DenoteMarkersWithBGColorToolStripMenuItem.Text = "Denote Markers With BG Color";
this.DenoteMarkersWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.DenoteMarkersWithBGColorToolStripMenuItem_Click);
//
// ColorSettingsMenuItem
//
this.ColorSettingsMenuItem.Text = "Edit TAStudio Colors...";
this.ColorSettingsMenuItem.Click += new System.EventHandler(this.ColorSettingsMenuItem_Click);
//
// followCursorToolStripMenuItem
//
this.followCursorToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -887,27 +897,22 @@ namespace BizHawk.Client.EmuHawk
//
// TasView
//
this.TasView.ChangeSelectionWhenPaging = false;
this.TasView.InputPaintingMode = true;
this.TasView.CellWidthPadding = 3;
this.TasView.GridLines = true;
this.TasView.AllowMassNavigationShortcuts = false;
this.TasView.AllowColumnReorder = false;
this.TasView.AllowColumnResize = false;
this.TasView.AllowMassNavigationShortcuts = false;
this.TasView.AllowRightClickSelection = false;
this.TasView.AlwaysScroll = false;
this.TasView.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.TasView.CellHeightPadding = 0;
this.TasView.ChangeSelectionWhenPaging = false;
this.TasView.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.TasView.FullRowSelect = true;
this.TasView.HideWasLagFrames = false;
this.TasView.HorizontalOrientation = false;
this.TasView.LagFramesToHide = 0;
this.TasView.InputPaintingMode = true;
this.TasView.LetKeysModifySelection = true;
this.TasView.Location = new System.Drawing.Point(3, 0);
this.TasView.MultiSelect = true;
this.TasView.Name = "TasView";
this.TasView.Rotatable = true;
this.TasView.RowCount = 0;
@ -942,7 +947,7 @@ namespace BizHawk.Client.EmuHawk
// MessageStatusLabel
//
this.MessageStatusLabel.Name = "MessageStatusLabel";
this.MessageStatusLabel.Size = new System.Drawing.Size(95, 17);
this.MessageStatusLabel.Size = new System.Drawing.Size(103, 17);
this.MessageStatusLabel.Text = "TAStudio engaged";
//
// ProgressBar
@ -953,7 +958,7 @@ namespace BizHawk.Client.EmuHawk
// toolStripStatusLabel2
//
this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
this.toolStripStatusLabel2.Size = new System.Drawing.Size(277, 17);
this.toolStripStatusLabel2.Size = new System.Drawing.Size(269, 17);
this.toolStripStatusLabel2.Spring = true;
//
// SplicerStatusLabel
@ -977,7 +982,7 @@ namespace BizHawk.Client.EmuHawk
this.MarkerControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.MarkerControl.Location = new System.Drawing.Point(0, 0);
this.MarkerControl.Name = "MarkerControl";
this.MarkerControl.Size = new System.Drawing.Size(200, 224);
this.MarkerControl.Size = new System.Drawing.Size(200, 225);
this.MarkerControl.TabIndex = 6;
this.MarkerControl.Tastudio = null;
//
@ -1012,7 +1017,7 @@ namespace BizHawk.Client.EmuHawk
this.StartNewProjectFromNowMenuItem,
this.StartANewProjectFromSaveRamMenuItem});
this.RightClickMenu.Name = "RightClickMenu";
this.RightClickMenu.Size = new System.Drawing.Size(243, 480);
this.RightClickMenu.Size = new System.Drawing.Size(253, 502);
this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened);
//
// SetMarkersContextMenuItem
@ -1133,7 +1138,7 @@ namespace BizHawk.Client.EmuHawk
this.BookMarkControl.Name = "BookMarkControl";
this.BookMarkControl.RemovedCallback = null;
this.BookMarkControl.SavedCallback = null;
this.BookMarkControl.Size = new System.Drawing.Size(200, 184);
this.BookMarkControl.Size = new System.Drawing.Size(200, 183);
this.BookMarkControl.TabIndex = 8;
this.BookMarkControl.Tastudio = null;
//
@ -1154,7 +1159,7 @@ namespace BizHawk.Client.EmuHawk
//
this.BranchesMarkersSplit.Panel2.Controls.Add(this.MarkerControl);
this.BranchesMarkersSplit.Size = new System.Drawing.Size(200, 412);
this.BranchesMarkersSplit.SplitterDistance = 184;
this.BranchesMarkersSplit.SplitterDistance = 183;
this.BranchesMarkersSplit.TabIndex = 9;
this.BranchesMarkersSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.BranchesMarkersSplit_SplitterMoved);
//
@ -1180,16 +1185,6 @@ namespace BizHawk.Client.EmuHawk
this.MainVertialSplit.TabIndex = 10;
this.MainVertialSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.MainVerticalSplit_SplitterMoved);
//
// SetFontMenuItem
//
this.SetFontMenuItem.Text = "Set Font";
this.SetFontMenuItem.Click += new System.EventHandler(this.SetFontMenuItem_Click);
//
// CopyIncludesFrameNoMenuItem
//
this.CopyIncludesFrameNoMenuItem.Text = "Include Frame No. When Copying Row(s)";
this.CopyIncludesFrameNoMenuItem.Click += new System.EventHandler(this.CopyIncludesFrameNoMenuItem_Click);
//
// TAStudio
//
this.AllowDrop = true;

View File

@ -40,7 +40,7 @@
this.AutoScrollCheck = new System.Windows.Forms.CheckBox();
this.MaxStepsNum = new System.Windows.Forms.NumericUpDown();
this.label1 = new BizHawk.WinForms.Controls.LocLabelEx();
this.HistoryView = new InputRoll();
this.HistoryView = new BizHawk.Client.EmuHawk.InputRoll();
this.RightClickMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.MaxStepsNum)).BeginInit();
this.SuspendLayout();
@ -149,21 +149,28 @@
//
// HistoryView
//
this.HistoryView.AllowColumnReorder = false;
this.HistoryView.AllowColumnResize = false;
this.HistoryView.AlwaysScroll = false;
this.HistoryView.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.HistoryView.RowCount = 0;
this.HistoryView.CellHeightPadding = 0;
this.HistoryView.CellWidthPadding = 0;
this.HistoryView.FullRowSelect = true;
this.HistoryView.HorizontalOrientation = false;
this.HistoryView.LetKeysModifySelection = false;
this.HistoryView.Location = new System.Drawing.Point(10, 10);
this.HistoryView.MultiSelect = false;
this.HistoryView.Name = "HistoryView";
this.HistoryView.RowCount = 0;
this.HistoryView.ScrollSpeed = 0;
this.HistoryView.SeekingCutoffInterval = 0;
this.HistoryView.Size = new System.Drawing.Size(369, 213);
this.HistoryView.TabIndex = 2;
this.HistoryView.DoubleClick += new System.EventHandler(this.HistoryView_DoubleClick);
this.HistoryView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.HistoryView_MouseDown);
this.HistoryView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.HistoryView_MouseUp);
this.HistoryView.AllowColumnReorder = false;
this.HistoryView.AllowColumnResize = false;
this.HistoryView.FullRowSelect = true;
//
// UndoHistoryForm
//

View File

@ -32,12 +32,12 @@ namespace BizHawk.Client.EmuHawk
{
this.components = new System.ComponentModel.Container();
this.TracerBox = new System.Windows.Forms.GroupBox();
this.TraceView = new InputRoll();
this.TraceView = new BizHawk.Client.EmuHawk.InputRoll();
this.TraceContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.CopyContextMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SelectAllContextMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.ClearContextMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.menuStrip1 = new MenuStripEx();
this.menuStrip1 = new BizHawk.WinForms.Controls.MenuStripEx();
this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SaveLogMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.EditSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -46,6 +46,7 @@ namespace BizHawk.Client.EmuHawk
this.ClearMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.OptionsSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.MaxLinesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SegmentSizeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.OpenLogFile = new System.Windows.Forms.Button();
this.BrowseBox = new System.Windows.Forms.Button();
@ -53,7 +54,6 @@ namespace BizHawk.Client.EmuHawk
this.ToFileRadio = new System.Windows.Forms.RadioButton();
this.ToWindowRadio = new System.Windows.Forms.RadioButton();
this.LoggingEnabled = new System.Windows.Forms.CheckBox();
this.SegmentSizeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.TracerBox.SuspendLayout();
this.TraceContextMenu.SuspendLayout();
this.menuStrip1.SuspendLayout();
@ -75,21 +75,27 @@ namespace BizHawk.Client.EmuHawk
//
// TraceView
//
this.TraceView.AllowColumnReorder = false;
this.TraceView.AllowColumnResize = true;
this.TraceView.AlwaysScroll = false;
this.TraceView.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.TraceView.CellHeightPadding = 0;
this.TraceView.CellWidthPadding = 0;
this.TraceView.ContextMenuStrip = this.TraceContextMenu;
this.TraceView.Font = new System.Drawing.Font("Courier New", 8F);
this.TraceView.FullRowSelect = true;
this.TraceView.GridLines = true;
this.TraceView.RowCount = 0;
this.TraceView.HorizontalOrientation = false;
this.TraceView.LetKeysModifySelection = false;
this.TraceView.Location = new System.Drawing.Point(8, 18);
this.TraceView.Name = "TraceView";
this.TraceView.RowCount = 0;
this.TraceView.ScrollSpeed = 0;
this.TraceView.SeekingCutoffInterval = 0;
this.TraceView.Size = new System.Drawing.Size(603, 414);
this.TraceView.TabIndex = 4;
this.TraceView.TabStop = false;
this.TraceView.AllowColumnResize = true;
this.TraceView.AllowColumnReorder = false;
//
// TraceContextMenu
//
@ -175,6 +181,11 @@ namespace BizHawk.Client.EmuHawk
this.MaxLinesMenuItem.Text = "&Set Max Lines...";
this.MaxLinesMenuItem.Click += new System.EventHandler(this.MaxLinesMenuItem_Click);
//
// SegmentSizeMenuItem
//
this.SegmentSizeMenuItem.Text = "Set Segment Size...";
this.SegmentSizeMenuItem.Click += new System.EventHandler(this.SegmentSizeMenuItem_Click);
//
// groupBox2
//
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
@ -262,11 +273,6 @@ namespace BizHawk.Client.EmuHawk
this.LoggingEnabled.UseVisualStyleBackColor = true;
this.LoggingEnabled.CheckedChanged += new System.EventHandler(this.LoggingEnabled_CheckedChanged);
//
// SegmentSizeMenuItem
//
this.SegmentSizeMenuItem.Text = "Set Segment Size...";
this.SegmentSizeMenuItem.Click += new System.EventHandler(this.SegmentSizeMenuItem_Click);
//
// TraceLogger
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

View File

@ -31,8 +31,9 @@ namespace BizHawk.Client.EmuHawk
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.SearchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.TotalSearchLabel = new BizHawk.WinForms.Controls.LocLabelEx();
this.WatchListView = new InputRoll();
this.WatchListView = new BizHawk.Client.EmuHawk.InputRoll();
this.ListViewContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.DoSearchContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.NewSearchContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -46,7 +47,7 @@ namespace BizHawk.Client.EmuHawk
this.ViewInHexEditorContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.ContextMenuSeparator3 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.ClearPreviewContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.RamSearchMenu = new MenuStripEx();
this.RamSearchMenu = new BizHawk.WinForms.Controls.MenuStripEx();
this.fileToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.OpenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SaveMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -87,6 +88,7 @@ namespace BizHawk.Client.EmuHawk
this.AddToRamWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.PokeAddressMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.FreezeAddressMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SelectAllMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.toolStripSeparator13 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.ClearUndoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -110,7 +112,7 @@ namespace BizHawk.Client.EmuHawk
this.SpecificAddressRadio = new System.Windows.Forms.RadioButton();
this.SpecificValueRadio = new System.Windows.Forms.RadioButton();
this.PreviousValueRadio = new System.Windows.Forms.RadioButton();
this.toolStrip1 = new ToolStripEx();
this.toolStrip1 = new BizHawk.WinForms.Controls.ToolStripEx();
this.DoSearchToolButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator10 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.NewSearchToolButton = new System.Windows.Forms.ToolStripButton();
@ -142,8 +144,6 @@ namespace BizHawk.Client.EmuHawk
this.label1 = new BizHawk.WinForms.Controls.LocLabelEx();
this.label2 = new BizHawk.WinForms.Controls.LocLabelEx();
this.DisplayTypeDropdown = new System.Windows.Forms.ComboBox();
this.SelectAllMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SearchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.ListViewContextMenu.SuspendLayout();
this.RamSearchMenu.SuspendLayout();
this.CompareToBox.SuspendLayout();
@ -164,22 +164,26 @@ namespace BizHawk.Client.EmuHawk
//
// WatchListView
//
this.WatchListView.CellWidthPadding = 3;
this.WatchListView.AllowColumnReorder = true;
this.WatchListView.AllowColumnResize = true;
this.WatchListView.AllowDrop = true;
this.WatchListView.AlwaysScroll = false;
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.CellHeightPadding = 0;
this.WatchListView.CellWidthPadding = 0;
this.WatchListView.ContextMenuStrip = this.ListViewContextMenu;
this.WatchListView.FullRowSelect = true;
this.WatchListView.GridLines = true;
this.WatchListView.RowCount = 0;
this.WatchListView.HorizontalOrientation = false;
this.WatchListView.LetKeysModifySelection = false;
this.WatchListView.Location = new System.Drawing.Point(9, 65);
this.WatchListView.Name = "WatchListView";
this.WatchListView.RowCount = 0;
this.WatchListView.ScrollSpeed = 0;
this.WatchListView.SeekingCutoffInterval = 0;
this.WatchListView.Size = new System.Drawing.Size(230, 366);
this.WatchListView.TabIndex = 1;
this.WatchListView.MultiSelect = true;
this.WatchListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.WatchListView_ColumnClick);
this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged);
this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragDrop);
@ -313,7 +317,7 @@ namespace BizHawk.Client.EmuHawk
this.RecentSubMenu.Text = "Recent";
this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened);
//
// settingsToolStripMenuItem
// OptionsSubMenuMenuItem
//
this.OptionsSubMenuMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.modeToolStripMenuItem,
@ -422,7 +426,7 @@ namespace BizHawk.Client.EmuHawk
this.searchToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.newSearchToolStripMenuItem,
this.toolStripSeparator7,
SearchMenuItem,
this.SearchMenuItem,
this.UndoMenuItem,
this.RedoMenuItem,
this.CopyValueToPrevMenuItem,
@ -497,12 +501,19 @@ namespace BizHawk.Client.EmuHawk
this.FreezeAddressMenuItem.Text = "Freeze Address";
this.FreezeAddressMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
//
// SelectAllMenuItem
//
this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A";
this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
this.SelectAllMenuItem.Text = "Select All";
this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
//
// ClearUndoMenuItem
//
this.ClearUndoMenuItem.Text = "Clear Undo History";
this.ClearUndoMenuItem.Click += new System.EventHandler(this.ClearUndoMenuItem_Click);
//
// optionsToolStripMenuItem
// SettingsMenuItem
//
this.SettingsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.PreviewModeMenuItem,
@ -539,13 +550,6 @@ namespace BizHawk.Client.EmuHawk
this.UseUndoHistoryMenuItem.Text = "&Use Undo History";
this.UseUndoHistoryMenuItem.Click += new System.EventHandler(this.UseUndoHistoryMenuItem_Click);
//
// SelectAllMenuItem
//
this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A";
this.SelectAllMenuItem.Text = "Select All";
this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
//
// MemDomainLabel
//
this.MemDomainLabel.Location = new System.Drawing.Point(135, 49);
@ -564,9 +568,9 @@ namespace BizHawk.Client.EmuHawk
this.AutoSearchCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.AutoSearchCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
this.AutoSearchCheckBox.AutoSize = true;
this.AutoSearchCheckBox.Location = new System.Drawing.Point(316, 410);
this.AutoSearchCheckBox.Location = new System.Drawing.Point(348, 410);
this.AutoSearchCheckBox.Name = "AutoSearchCheckBox";
this.AutoSearchCheckBox.Size = new System.Drawing.Size(38, 22);
this.AutoSearchCheckBox.Size = new System.Drawing.Size(6, 6);
this.AutoSearchCheckBox.TabIndex = 105;
this.AutoSearchCheckBox.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
this.toolTip1.SetToolTip(this.AutoSearchCheckBox, "Automatically search each frame");
@ -600,11 +604,12 @@ namespace BizHawk.Client.EmuHawk
this.DifferenceBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.DifferenceBox.Enabled = false;
this.DifferenceBox.Location = new System.Drawing.Point(114, 98);
this.DifferenceBox.MaxLength = 8;
this.DifferenceBox.MaxLength = 2;
this.DifferenceBox.Name = "DifferenceBox";
this.DifferenceBox.Nullable = false;
this.DifferenceBox.Size = new System.Drawing.Size(72, 20);
this.DifferenceBox.TabIndex = 45;
this.DifferenceBox.Text = "00";
this.DifferenceBox.Type = BizHawk.Client.Common.WatchDisplayType.Hex;
this.DifferenceBox.TextChanged += new System.EventHandler(this.CompareToValue_TextChanged);
//
@ -739,7 +744,7 @@ namespace BizHawk.Client.EmuHawk
this.DoSearchToolButton.Enabled = false;
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(49, 22);
this.DoSearchToolButton.Text = "Search ";
this.DoSearchToolButton.Click += new System.EventHandler(this.SearchMenuItem_Click);
//
@ -747,7 +752,7 @@ namespace BizHawk.Client.EmuHawk
//
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(35, 22);
this.NewSearchToolButton.Text = "New";
this.NewSearchToolButton.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click);
//
@ -875,11 +880,12 @@ namespace BizHawk.Client.EmuHawk
this.DifferentByBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.DifferentByBox.Enabled = false;
this.DifferentByBox.Location = new System.Drawing.Point(88, 132);
this.DifferentByBox.MaxLength = 9;
this.DifferentByBox.MaxLength = 2;
this.DifferentByBox.Name = "DifferentByBox";
this.DifferentByBox.Nullable = false;
this.DifferentByBox.Size = new System.Drawing.Size(55, 20);
this.DifferentByBox.TabIndex = 85;
this.DifferentByBox.Text = "00";
this.DifferentByBox.Type = BizHawk.Client.Common.WatchDisplayType.Hex;
this.DifferentByBox.TextChanged += new System.EventHandler(this.DifferentByBox_TextChanged);
//
@ -1064,7 +1070,6 @@ namespace BizHawk.Client.EmuHawk
#endregion
private BizHawk.WinForms.Controls.LocLabelEx TotalSearchLabel;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx SearchMenuItem;
private InputRoll WatchListView;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx fileToolStripMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx OpenMenuItem;
@ -1176,5 +1181,6 @@ namespace BizHawk.Client.EmuHawk
private BizHawk.WinForms.Controls.ToolStripMenuItemEx Previous_LastChangeMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx AutoSearchAccountForLagMenuItem;
private ToolStripMenuItemEx SelectAllMenuItem;
private ToolStripMenuItemEx SearchMenuItem;
}
}

View File

@ -117,9 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="SearchMenuItem.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="ListViewContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>161, 17</value>
</metadata>

View File

@ -51,10 +51,10 @@ namespace BizHawk.Client.EmuHawk
this.MoveDownContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.MoveTopContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.MoveBottomContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.statusStrip1 = new StatusStripEx();
this.statusStrip1 = new BizHawk.WinForms.Controls.StatusStripEx();
this.ErrorIconButton = new System.Windows.Forms.ToolStripButton();
this.MessageLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStrip1 = new ToolStripEx();
this.toolStrip1 = new BizHawk.WinForms.Controls.ToolStripEx();
this.newToolStripButton = new System.Windows.Forms.ToolStripButton();
this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
this.saveToolStripButton = new System.Windows.Forms.ToolStripButton();
@ -72,7 +72,7 @@ namespace BizHawk.Client.EmuHawk
this.moveUpToolStripButton = new System.Windows.Forms.ToolStripButton();
this.moveDownToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator5 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.RamWatchMenu = new MenuStripEx();
this.RamWatchMenu = new BizHawk.WinForms.Controls.MenuStripEx();
this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.NewListMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.OpenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -106,10 +106,10 @@ namespace BizHawk.Client.EmuHawk
this.LastChangeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.OriginalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.WatchesOnScreenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.WatchListView = new InputRoll();
this.DoubleClickActionSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.DoubleClickToEditMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.DoubleClickToPokeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.WatchListView = new BizHawk.Client.EmuHawk.InputRoll();
this.ListViewContextMenu.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
@ -144,7 +144,7 @@ namespace BizHawk.Client.EmuHawk
this.MoveTopContextMenuItem,
this.MoveBottomContextMenuItem});
this.ListViewContextMenu.Name = "contextMenuStrip1";
this.ListViewContextMenu.Size = new System.Drawing.Size(245, 346);
this.ListViewContextMenu.Size = new System.Drawing.Size(245, 368);
this.ListViewContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ListViewContextMenu_Opening);
//
// newToolStripMenuItem
@ -594,8 +594,8 @@ namespace BizHawk.Client.EmuHawk
//
// SelectAllMenuItem
//
this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A";
this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
this.SelectAllMenuItem.Text = "Select &All";
this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
//
@ -637,32 +637,6 @@ namespace BizHawk.Client.EmuHawk
this.WatchesOnScreenMenuItem.Text = "Display Watches On Screen";
this.WatchesOnScreenMenuItem.Click += new System.EventHandler(this.WatchesOnScreenMenuItem_Click);
//
// WatchListView
//
this.WatchListView.CellWidthPadding = 3;
this.WatchListView.AllowColumnResize = true;
this.WatchListView.AllowColumnReorder = true;
this.WatchListView.FullRowSelect = true;
this.WatchListView.MultiSelect = true;
this.WatchListView.AllowColumnReorder = true;
this.WatchListView.AllowDrop = 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.ContextMenuStrip = this.ListViewContextMenu;
this.WatchListView.FullRowSelect = true;
this.WatchListView.GridLines = true;
this.WatchListView.Location = new System.Drawing.Point(16, 76);
this.WatchListView.Name = "WatchListView";
this.WatchListView.Size = new System.Drawing.Size(363, 281);
this.WatchListView.TabIndex = 2;
this.WatchListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.WatchListView_ColumnClick);
this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged);
this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragDrop);
this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper);
this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick);
//
// DoubleClickActionSubMenu
//
this.DoubleClickActionSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -681,6 +655,35 @@ namespace BizHawk.Client.EmuHawk
this.DoubleClickToPokeMenuItem.Text = "Poke Address";
this.DoubleClickToPokeMenuItem.Click += new System.EventHandler(this.DoubleClickToPokeMenuItem_Click);
//
// WatchListView
//
this.WatchListView.AllowColumnReorder = true;
this.WatchListView.AllowColumnResize = true;
this.WatchListView.AllowDrop = true;
this.WatchListView.AlwaysScroll = false;
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.CellHeightPadding = 0;
this.WatchListView.CellWidthPadding = 0;
this.WatchListView.ContextMenuStrip = this.ListViewContextMenu;
this.WatchListView.FullRowSelect = true;
this.WatchListView.HorizontalOrientation = false;
this.WatchListView.LetKeysModifySelection = false;
this.WatchListView.Location = new System.Drawing.Point(16, 76);
this.WatchListView.Name = "WatchListView";
this.WatchListView.RowCount = 0;
this.WatchListView.ScrollSpeed = 0;
this.WatchListView.SeekingCutoffInterval = 0;
this.WatchListView.Size = new System.Drawing.Size(363, 281);
this.WatchListView.TabIndex = 2;
this.WatchListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.WatchListView_ColumnClick);
this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged);
this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragDrop);
this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper);
this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick);
//
// RamWatch
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);