diff --git a/GUI.NET/Debugger/Controls/ctrlDebuggerCode.Designer.cs b/GUI.NET/Debugger/Controls/ctrlDebuggerCode.Designer.cs index 4b9966da..e61a70a2 100644 --- a/GUI.NET/Debugger/Controls/ctrlDebuggerCode.Designer.cs +++ b/GUI.NET/Debugger/Controls/ctrlDebuggerCode.Designer.cs @@ -136,6 +136,7 @@ // mnuEditLabel // this.mnuEditLabel.Name = "mnuEditLabel"; + this.mnuEditLabel.ShortcutKeys = System.Windows.Forms.Keys.F2; this.mnuEditLabel.Size = new System.Drawing.Size(258, 22); this.mnuEditLabel.Text = "Edit Label"; this.mnuEditLabel.Click += new System.EventHandler(this.mnuEditLabel_Click); @@ -148,6 +149,7 @@ // mnuGoToLocation // this.mnuGoToLocation.Name = "mnuGoToLocation"; + this.mnuGoToLocation.ShortcutKeyDisplayString = "Ctrl+Click"; this.mnuGoToLocation.Size = new System.Drawing.Size(258, 22); this.mnuGoToLocation.Text = "Go To Location"; this.mnuGoToLocation.Click += new System.EventHandler(this.mnuGoToLocation_Click); @@ -155,6 +157,7 @@ // mnuAddToWatch // this.mnuAddToWatch.Name = "mnuAddToWatch"; + this.mnuAddToWatch.ShortcutKeyDisplayString = "Shift+Click"; this.mnuAddToWatch.Size = new System.Drawing.Size(258, 22); this.mnuAddToWatch.Text = "Add to Watch"; this.mnuAddToWatch.Click += new System.EventHandler(this.mnuAddToWatch_Click); @@ -162,6 +165,7 @@ // mnuFindOccurrences // this.mnuFindOccurrences.Name = "mnuFindOccurrences"; + this.mnuFindOccurrences.ShortcutKeyDisplayString = "Alt+Click"; this.mnuFindOccurrences.Size = new System.Drawing.Size(258, 22); this.mnuFindOccurrences.Text = "Find Occurrences"; this.mnuFindOccurrences.Click += new System.EventHandler(this.mnuFindOccurrences_Click); @@ -206,6 +210,7 @@ this.ctrlCodeViewer.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ctrlCodeViewer_MouseDown); this.ctrlCodeViewer.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.ctrlCodeViewer_MouseDoubleClick); this.ctrlCodeViewer.FontSizeChanged += new System.EventHandler(this.ctrlCodeViewer_FontSizeChanged); + this.ctrlCodeViewer.MouseLeave += new System.EventHandler(this.ctrlCodeViewer_MouseLeave); // // contextMenuMargin // diff --git a/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs b/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs index a0722e86..71aebb71 100644 --- a/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs +++ b/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs @@ -214,13 +214,24 @@ namespace Mesen.GUI.Debugger _preventCloseTooltip = true; _hoverLastWord = word; } + + private void ctrlCodeViewer_MouseLeave(object sender, EventArgs e) + { + if(_codeTooltip != null) { + _codeTooltip.Close(); + _codeTooltip = null; + } + } private void ctrlCodeViewer_MouseMove(object sender, MouseEventArgs e) { + //Always enable to allow F2 shortcut + mnuEditLabel.Enabled = true; + if(e.Location.X < this.ctrlCodeViewer.CodeMargin / 5) { - this.ContextMenuStrip = contextMenuMargin; + this.ctrlCodeViewer.ContextMenuStrip = contextMenuMargin; } else { - this.ContextMenuStrip = contextMenuCode; + this.ctrlCodeViewer.ContextMenuStrip = contextMenuCode; } if(_previousLocation != e.Location) { @@ -291,31 +302,21 @@ namespace Mesen.GUI.Debugger ShowTooltip(word, values); } - UInt32 _lastClickedAddress = UInt32.MaxValue; - string _newWatchValue = string.Empty; - string _lastWord = string.Empty; - private void ctrlCodeViewer_MouseUp(object sender, MouseEventArgs e) + private bool UpdateContextMenu(Point mouseLocation) { - string word = GetWordUnderLocation(e.Location); + string word = GetWordUnderLocation(mouseLocation); if(word.StartsWith("$") || LabelManager.GetLabel(word) != null) { + //Cursor is on a numeric value or label _lastWord = word; if(word.StartsWith("$")) { - _lastClickedAddress = UInt32.Parse(word.Substring(1), System.Globalization.NumberStyles.AllowHexSpecifier); + _lastClickedAddress = Int32.Parse(word.Substring(1), System.Globalization.NumberStyles.AllowHexSpecifier); _newWatchValue = "[$" + _lastClickedAddress.ToString("X") + "]"; } else { - _lastClickedAddress = (UInt32)InteropEmu.DebugGetRelativeAddress(LabelManager.GetLabel(word).Address, LabelManager.GetLabel(word).AddressType); + _lastClickedAddress = (Int32)InteropEmu.DebugGetRelativeAddress(LabelManager.GetLabel(word).Address, LabelManager.GetLabel(word).AddressType); _newWatchValue = "[" + word + "]"; } - if(e.Button == MouseButtons.Left) { - if(ModifierKeys.HasFlag(Keys.Control)) { - GoToLocation(); - } else if(ModifierKeys.HasFlag(Keys.Shift)) { - AddWatch(); - } - } - mnuGoToLocation.Enabled = true; mnuGoToLocation.Text = $"Go to Location ({word})"; @@ -327,6 +328,8 @@ namespace Mesen.GUI.Debugger mnuEditLabel.Enabled = true; mnuEditLabel.Text = $"Edit Label ({word})"; + + return true; } else { mnuGoToLocation.Enabled = false; mnuGoToLocation.Text = "Go to Location"; @@ -337,10 +340,10 @@ namespace Mesen.GUI.Debugger mnuEditLabel.Enabled = false; mnuEditLabel.Text = "Edit Label"; - if(e.Location.X < this.ctrlCodeViewer.CodeMargin && ctrlCodeViewer.CurrentLine >= 0) { - _lastClickedAddress = (UInt32)ctrlCodeViewer.CurrentLine; - - string address = $"${_lastClickedAddress.ToString("X4")}"; + _lastClickedAddress = ctrlCodeViewer.GetLineNumberAtPosition(mouseLocation.Y); + if(mouseLocation.X < this.ctrlCodeViewer.CodeMargin && _lastClickedAddress >= 0) { + //Cursor is in the margin, over an address label + string address = $"${_lastClickedAddress.ToString("X4")}"; _newWatchValue = $"[{address}]"; _lastWord = address; @@ -350,6 +353,28 @@ namespace Mesen.GUI.Debugger mnuFindOccurrences.Text = $"Find Occurrences ({address})"; mnuEditLabel.Enabled = true; mnuEditLabel.Text = $"Edit Label ({address})"; + + return true; + } + + return false; + } + } + + int _lastClickedAddress = Int32.MaxValue; + string _newWatchValue = string.Empty; + string _lastWord = string.Empty; + private void ctrlCodeViewer_MouseUp(object sender, MouseEventArgs e) + { + if(UpdateContextMenu(e.Location)) { + if(e.Button == MouseButtons.Left) { + if(ModifierKeys.HasFlag(Keys.Control)) { + GoToLocation(); + } else if(ModifierKeys.HasFlag(Keys.Shift)) { + AddWatch(); + } else if(ModifierKeys.HasFlag(Keys.Alt)) { + FindAllOccurrences(_lastWord, true, true); + } } } } @@ -481,14 +506,16 @@ namespace Mesen.GUI.Debugger this.lblSearchResult.Text = $"Search results for: {text} ({this.lstSearchResult.Items.Count} results)"; this.lstSearchResult.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent); this.lstSearchResult.Columns[0].Width += 20; - this.lstSearchResult.Columns[1].Width = Math.Max(this.lstSearchResult.Columns[1].Width, this.lstSearchResult.Width - this.lstSearchResult.Columns[0].Width - 4); + this.lstSearchResult.Columns[1].Width = Math.Max(this.lstSearchResult.Columns[1].Width, this.lstSearchResult.Width - this.lstSearchResult.Columns[0].Width - 24); this.splitContainer.Panel2Collapsed = false; } private void lstSearchResult_SizeChanged(object sender, EventArgs e) { + this.lstSearchResult.SizeChanged -= lstSearchResult_SizeChanged; this.lstSearchResult.Columns[1].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent); - this.lstSearchResult.Columns[1].Width = Math.Max(this.lstSearchResult.Columns[1].Width, this.lstSearchResult.Width - this.lstSearchResult.Columns[0].Width - 4); + this.lstSearchResult.Columns[1].Width = Math.Max(this.lstSearchResult.Columns[1].Width, this.lstSearchResult.Width - this.lstSearchResult.Columns[0].Width - 24); + this.lstSearchResult.SizeChanged += lstSearchResult_SizeChanged; } private void picCloseOccurrenceList_Click(object sender, EventArgs e) @@ -535,10 +562,12 @@ namespace Mesen.GUI.Debugger private void mnuEditLabel_Click(object sender, EventArgs e) { - AddressTypeInfo info = new AddressTypeInfo(); - InteropEmu.DebugGetAbsoluteAddressAndType(_lastClickedAddress, ref info); - if(info.Address >= 0) { - ctrlLabelList.EditLabel((UInt32)info.Address, info.Type); + if(UpdateContextMenu(_previousLocation)) { + AddressTypeInfo info = new AddressTypeInfo(); + InteropEmu.DebugGetAbsoluteAddressAndType((UInt32)_lastClickedAddress, ref info); + if(info.Address >= 0) { + ctrlLabelList.EditLabel((UInt32)info.Address, info.Type); + } } } diff --git a/GUI.NET/Debugger/Controls/ctrlFunctionList.Designer.cs b/GUI.NET/Debugger/Controls/ctrlFunctionList.Designer.cs index 699a8d3b..38e03079 100644 --- a/GUI.NET/Debugger/Controls/ctrlFunctionList.Designer.cs +++ b/GUI.NET/Debugger/Controls/ctrlFunctionList.Designer.cs @@ -87,6 +87,7 @@ // mnuEditLabel // this.mnuEditLabel.Name = "mnuEditLabel"; + this.mnuEditLabel.ShortcutKeys = System.Windows.Forms.Keys.F2; this.mnuEditLabel.Size = new System.Drawing.Size(166, 22); this.mnuEditLabel.Text = "Edit Label"; this.mnuEditLabel.Click += new System.EventHandler(this.mnuEditLabel_Click); diff --git a/GUI.NET/Debugger/Controls/ctrlFunctionList.cs b/GUI.NET/Debugger/Controls/ctrlFunctionList.cs index 917a83b9..f1b1cd69 100644 --- a/GUI.NET/Debugger/Controls/ctrlFunctionList.cs +++ b/GUI.NET/Debugger/Controls/ctrlFunctionList.cs @@ -124,11 +124,13 @@ namespace Mesen.GUI.Debugger.Controls private void mnuEditLabel_Click(object sender, EventArgs e) { - CodeLabel label = lstFunctions.SelectedItems[0].Tag as CodeLabel; - if(label != null) { - ctrlLabelList.EditLabel(label.Address, label.AddressType); - } else { - ctrlLabelList.EditLabel((UInt32)(Int32)lstFunctions.SelectedItems[0].SubItems[2].Tag, AddressType.PrgRom); + if(lstFunctions.SelectedItems.Count > 0) { + CodeLabel label = lstFunctions.SelectedItems[0].Tag as CodeLabel; + if(label != null) { + ctrlLabelList.EditLabel(label.Address, label.AddressType); + } else { + ctrlLabelList.EditLabel((UInt32)(Int32)lstFunctions.SelectedItems[0].SubItems[2].Tag, AddressType.PrgRom); + } } } diff --git a/GUI.NET/Debugger/Controls/ctrlLabelList.Designer.cs b/GUI.NET/Debugger/Controls/ctrlLabelList.Designer.cs index 3db4980c..03679107 100644 --- a/GUI.NET/Debugger/Controls/ctrlLabelList.Designer.cs +++ b/GUI.NET/Debugger/Controls/ctrlLabelList.Designer.cs @@ -50,7 +50,7 @@ this.toolStripMenuItem1, this.mnuFindOccurrences}); this.contextMenu.Name = "contextMenu"; - this.contextMenu.Size = new System.Drawing.Size(167, 98); + this.contextMenu.Size = new System.Drawing.Size(167, 120); this.contextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.mnuActions_Opening); // // mnuAdd @@ -64,6 +64,7 @@ // mnuEdit // this.mnuEdit.Name = "mnuEdit"; + this.mnuEdit.ShortcutKeys = System.Windows.Forms.Keys.F2; this.mnuEdit.Size = new System.Drawing.Size(166, 22); this.mnuEdit.Text = "Edit"; this.mnuEdit.Click += new System.EventHandler(this.mnuEdit_Click); diff --git a/GUI.NET/Debugger/Controls/ctrlLabelList.cs b/GUI.NET/Debugger/Controls/ctrlLabelList.cs index 95407f7d..70d451f6 100644 --- a/GUI.NET/Debugger/Controls/ctrlLabelList.cs +++ b/GUI.NET/Debugger/Controls/ctrlLabelList.cs @@ -152,9 +152,26 @@ namespace Mesen.GUI.Debugger.Controls private void mnuDelete_Click(object sender, EventArgs e) { - for(int i = lstLabels.SelectedItems.Count - 1; i >= 0; i--) { - CodeLabel label = (CodeLabel)lstLabels.SelectedItems[i].SubItems[1].Tag; - LabelManager.DeleteLabel(label.Address, label.AddressType, i == 0); + if(lstLabels.SelectedItems.Count > 0) { + int topIndex = lstLabels.TopItem.Index; + int lastSelectedIndex = lstLabels.SelectedIndices[lstLabels.SelectedIndices.Count - 1]; + for(int i = lstLabels.SelectedItems.Count - 1; i >= 0; i--) { + CodeLabel label = (CodeLabel)lstLabels.SelectedItems[i].SubItems[1].Tag; + LabelManager.DeleteLabel(label.Address, label.AddressType, i == 0); + } + + //Reposition scroll bar and selected/focused item + if(lstLabels.Items.Count > topIndex) { + lstLabels.TopItem = lstLabels.Items[topIndex]; + } + if(lastSelectedIndex < lstLabels.Items.Count) { + lstLabels.Items[lastSelectedIndex].Selected = true; + } else if(lstLabels.Items.Count > 0) { + lstLabels.Items[lstLabels.Items.Count - 1].Selected = true; + } + if(lstLabels.SelectedItems.Count > 0) { + lstLabels.SelectedItems[0].Focused = true; + } } } @@ -170,8 +187,10 @@ namespace Mesen.GUI.Debugger.Controls private void mnuEdit_Click(object sender, EventArgs e) { - CodeLabel label = (CodeLabel)lstLabels.SelectedItems[0].SubItems[1].Tag; - EditLabel(label.Address, label.AddressType); + if(lstLabels.SelectedItems.Count > 0) { + CodeLabel label = (CodeLabel)lstLabels.SelectedItems[0].SubItems[1].Tag; + EditLabel(label.Address, label.AddressType); + } } private void mnuFindOccurrences_Click(object sender, EventArgs e) diff --git a/GUI.NET/Debugger/Controls/ctrlScrollableTextbox.cs b/GUI.NET/Debugger/Controls/ctrlScrollableTextbox.cs index 3ed7b338..0cdebff8 100644 --- a/GUI.NET/Debugger/Controls/ctrlScrollableTextbox.cs +++ b/GUI.NET/Debugger/Controls/ctrlScrollableTextbox.cs @@ -38,6 +38,12 @@ namespace Mesen.GUI.Debugger remove { this.ctrlTextbox.MouseDoubleClick -= value; } } + public new event EventHandler MouseLeave + { + add { this.ctrlTextbox.MouseLeave += value; } + remove { this.ctrlTextbox.MouseLeave -= value; } + } + public event EventHandler FontSizeChanged; public ctrlScrollableTextbox() diff --git a/GUI.NET/Debugger/frmDebugger.Designer.cs b/GUI.NET/Debugger/frmDebugger.Designer.cs index 141d4651..63f0d3dd 100644 --- a/GUI.NET/Debugger/frmDebugger.Designer.cs +++ b/GUI.NET/Debugger/frmDebugger.Designer.cs @@ -33,9 +33,6 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.contextMenuCode = new System.Windows.Forms.ContextMenuStrip(this.components); - this.mnuShowNextStatement = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuSetNextStatement = new System.Windows.Forms.ToolStripMenuItem(); this.tmrCdlRatios = new System.Windows.Forms.Timer(this.components); this.splitContainer = new System.Windows.Forms.SplitContainer(); this.tlpTop = new System.Windows.Forms.TableLayoutPanel(); @@ -60,6 +57,8 @@ this.mnuWorkspace = new System.Windows.Forms.ToolStripMenuItem(); this.mnuImportLabels = new System.Windows.Forms.ToolStripMenuItem(); this.mnuResetWorkspace = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuAutoLoadDbgFiles = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.mnuClose = new System.Windows.Forms.ToolStripMenuItem(); this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -124,9 +123,6 @@ this.lblChrAnalysisResult = new System.Windows.Forms.ToolStripStatusLabel(); this.ctrlPpuMemoryMapping = new Mesen.GUI.Debugger.Controls.ctrlMemoryMapping(); this.ctrlCpuMemoryMapping = new Mesen.GUI.Debugger.Controls.ctrlMemoryMapping(); - this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuAutoLoadDbgFiles = new System.Windows.Forms.ToolStripMenuItem(); - this.contextMenuCode.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); @@ -144,30 +140,6 @@ this.statusStrip.SuspendLayout(); this.SuspendLayout(); // - // contextMenuCode - // - this.contextMenuCode.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnuShowNextStatement, - this.mnuSetNextStatement}); - this.contextMenuCode.Name = "contextMenuWatch"; - this.contextMenuCode.Size = new System.Drawing.Size(259, 48); - // - // mnuShowNextStatement - // - this.mnuShowNextStatement.Name = "mnuShowNextStatement"; - this.mnuShowNextStatement.ShortcutKeyDisplayString = "Alt+*"; - this.mnuShowNextStatement.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Multiply))); - this.mnuShowNextStatement.Size = new System.Drawing.Size(258, 22); - this.mnuShowNextStatement.Text = "Show Next Statement"; - // - // mnuSetNextStatement - // - this.mnuSetNextStatement.Name = "mnuSetNextStatement"; - this.mnuSetNextStatement.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.F10))); - this.mnuSetNextStatement.Size = new System.Drawing.Size(258, 22); - this.mnuSetNextStatement.Text = "Set Next Statement"; - // // tmrCdlRatios // this.tmrCdlRatios.Interval = 300; @@ -216,7 +188,6 @@ // ctrlDebuggerCode // this.ctrlDebuggerCode.Code = null; - this.ctrlDebuggerCode.ContextMenuStrip = this.contextMenuCode; this.ctrlDebuggerCode.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlDebuggerCode.Location = new System.Drawing.Point(3, 3); this.ctrlDebuggerCode.Name = "ctrlDebuggerCode"; @@ -428,7 +399,7 @@ this.toolStripMenuItem10, this.mnuAutoLoadDbgFiles}); this.mnuWorkspace.Name = "mnuWorkspace"; - this.mnuWorkspace.Size = new System.Drawing.Size(152, 22); + this.mnuWorkspace.Size = new System.Drawing.Size(132, 22); this.mnuWorkspace.Text = "Workspace"; // // mnuImportLabels @@ -447,15 +418,28 @@ this.mnuResetWorkspace.Text = "Reset"; this.mnuResetWorkspace.Click += new System.EventHandler(this.mnuResetWorkspace_Click); // + // toolStripMenuItem10 + // + this.toolStripMenuItem10.Name = "toolStripMenuItem10"; + this.toolStripMenuItem10.Size = new System.Drawing.Size(175, 6); + // + // mnuAutoLoadDbgFiles + // + this.mnuAutoLoadDbgFiles.CheckOnClick = true; + this.mnuAutoLoadDbgFiles.Name = "mnuAutoLoadDbgFiles"; + this.mnuAutoLoadDbgFiles.Size = new System.Drawing.Size(178, 22); + this.mnuAutoLoadDbgFiles.Text = "Auto-load DBG files"; + this.mnuAutoLoadDbgFiles.CheckedChanged += new System.EventHandler(this.mnuAutoLoadDbgFiles_CheckedChanged); + // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(129, 6); // // mnuClose // this.mnuClose.Name = "mnuClose"; - this.mnuClose.Size = new System.Drawing.Size(152, 22); + this.mnuClose.Size = new System.Drawing.Size(132, 22); this.mnuClose.Text = "Close"; this.mnuClose.Click += new System.EventHandler(this.mnuClose_Click); // @@ -975,19 +959,6 @@ this.ctrlCpuMemoryMapping.Text = "ctrlMemoryMapping1"; this.ctrlCpuMemoryMapping.Visible = false; // - // toolStripMenuItem10 - // - this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - this.toolStripMenuItem10.Size = new System.Drawing.Size(175, 6); - // - // mnuAutoLoadDbgFiles - // - this.mnuAutoLoadDbgFiles.CheckOnClick = true; - this.mnuAutoLoadDbgFiles.Name = "mnuAutoLoadDbgFiles"; - this.mnuAutoLoadDbgFiles.Size = new System.Drawing.Size(178, 22); - this.mnuAutoLoadDbgFiles.Text = "Auto-load DBG files"; - this.mnuAutoLoadDbgFiles.CheckedChanged += new System.EventHandler(this.mnuAutoLoadDbgFiles_CheckedChanged); - // // frmDebugger // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1004,7 +975,6 @@ this.Text = "Debugger"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.frmDebugger_FormClosed); this.Resize += new System.EventHandler(this.frmDebugger_Resize); - this.contextMenuCode.ResumeLayout(false); this.splitContainer.Panel1.ResumeLayout(false); this.splitContainer.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); @@ -1051,9 +1021,6 @@ private ctrlDebuggerCode ctrlDebuggerCode; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem mnuRunOneFrame; - private System.Windows.Forms.ContextMenuStrip contextMenuCode; - private System.Windows.Forms.ToolStripMenuItem mnuShowNextStatement; - private System.Windows.Forms.ToolStripMenuItem mnuSetNextStatement; private ctrlWatch ctrlWatch; private ctrlConsoleStatus ctrlConsoleStatus; private System.Windows.Forms.ToolStripMenuItem mnuClose; diff --git a/GUI.NET/Debugger/frmDebugger.resx b/GUI.NET/Debugger/frmDebugger.resx index 0af933a5..42a737c0 100644 --- a/GUI.NET/Debugger/frmDebugger.resx +++ b/GUI.NET/Debugger/frmDebugger.resx @@ -120,16 +120,13 @@ 17, 17 - - 107, 17 - - 367, 17 + 215, 17 - 259, 17 + 107, 17 - 489, 17 + 337, 17 \ No newline at end of file