Debugger: Added some icons, changed some shortcuts

This commit is contained in:
Souryo 2017-03-11 11:46:29 -05:00
parent 7b382e4bb4
commit 4d1145ebea
14 changed files with 136 additions and 86 deletions

View file

@ -53,41 +53,44 @@
this.toolStripMenuItem1,
this.mnuGoToLocation});
this.contextMenuBreakpoints.Name = "contextMenuWatch";
this.contextMenuBreakpoints.Size = new System.Drawing.Size(150, 98);
this.contextMenuBreakpoints.Size = new System.Drawing.Size(153, 120);
//
// mnuAddBreakpoint
//
this.mnuAddBreakpoint.Image = global::Mesen.GUI.Properties.Resources.Add;
this.mnuAddBreakpoint.Name = "mnuAddBreakpoint";
this.mnuAddBreakpoint.ShortcutKeys = System.Windows.Forms.Keys.Insert;
this.mnuAddBreakpoint.Size = new System.Drawing.Size(149, 22);
this.mnuAddBreakpoint.Size = new System.Drawing.Size(152, 22);
this.mnuAddBreakpoint.Text = "Add...";
this.mnuAddBreakpoint.Click += new System.EventHandler(this.mnuAddBreakpoint_Click);
//
// mnuEditBreakpoint
//
this.mnuEditBreakpoint.Image = global::Mesen.GUI.Properties.Resources.Edit;
this.mnuEditBreakpoint.Name = "mnuEditBreakpoint";
this.mnuEditBreakpoint.ShortcutKeys = System.Windows.Forms.Keys.F2;
this.mnuEditBreakpoint.Size = new System.Drawing.Size(149, 22);
this.mnuEditBreakpoint.Size = new System.Drawing.Size(152, 22);
this.mnuEditBreakpoint.Text = "Edit";
this.mnuEditBreakpoint.Click += new System.EventHandler(this.mnuEditBreakpoint_Click);
//
// mnuRemoveBreakpoint
//
this.mnuRemoveBreakpoint.Image = global::Mesen.GUI.Properties.Resources.Close;
this.mnuRemoveBreakpoint.Name = "mnuRemoveBreakpoint";
this.mnuRemoveBreakpoint.ShortcutKeys = System.Windows.Forms.Keys.Delete;
this.mnuRemoveBreakpoint.Size = new System.Drawing.Size(149, 22);
this.mnuRemoveBreakpoint.Size = new System.Drawing.Size(152, 22);
this.mnuRemoveBreakpoint.Text = "Remove";
this.mnuRemoveBreakpoint.Click += new System.EventHandler(this.mnuRemoveBreakpoint_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(146, 6);
this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
//
// mnuGoToLocation
//
this.mnuGoToLocation.Name = "mnuGoToLocation";
this.mnuGoToLocation.Size = new System.Drawing.Size(149, 22);
this.mnuGoToLocation.Size = new System.Drawing.Size(152, 22);
this.mnuGoToLocation.Text = "Go to location";
this.mnuGoToLocation.Click += new System.EventHandler(this.mnuGoToLocation_Click);
//

View file

@ -46,10 +46,10 @@
this.mnuPrgAddressBelow = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator();
this.mnuHidePrgAddresses = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.sepEditLabel = new System.Windows.Forms.ToolStripSeparator();
this.mnuEditLabel = new System.Windows.Forms.ToolStripMenuItem();
this.mnuToggleBreakpoint = new System.Windows.Forms.ToolStripMenuItem();
this.sepBreakpoint = new System.Windows.Forms.ToolStripSeparator();
this.sepAddToWatch = new System.Windows.Forms.ToolStripSeparator();
this.mnuAddToWatch = new System.Windows.Forms.ToolStripMenuItem();
this.mnuFindOccurrences = new System.Windows.Forms.ToolStripMenuItem();
this.mnuGoToLocation = new System.Windows.Forms.ToolStripMenuItem();
@ -59,9 +59,9 @@
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.ctrlCodeViewer = new Mesen.GUI.Debugger.ctrlScrollableTextbox();
this.contextMenuMargin = new System.Windows.Forms.ContextMenuStrip(this.components);
this.mnuEditBreakpoint = new System.Windows.Forms.ToolStripMenuItem();
this.mnuDisableBreakpoint = new System.Windows.Forms.ToolStripMenuItem();
this.mnuRemoveBreakpoint = new System.Windows.Forms.ToolStripMenuItem();
this.mnuEditBreakpoint = new System.Windows.Forms.ToolStripMenuItem();
this.splitContainer = new System.Windows.Forms.SplitContainer();
this.tlpSearchResults = new System.Windows.Forms.TableLayoutPanel();
this.lstSearchResult = new System.Windows.Forms.ListView();
@ -93,10 +93,10 @@
this.toolStripMenuItem1,
this.mnuShowCodeNotes,
this.mnuShowLineNotes,
this.toolStripMenuItem2,
this.sepEditLabel,
this.mnuEditLabel,
this.mnuToggleBreakpoint,
this.sepBreakpoint,
this.sepAddToWatch,
this.mnuAddToWatch,
this.mnuFindOccurrences,
this.mnuGoToLocation,
@ -104,7 +104,7 @@
this.mnuNavigateBackward,
this.mnuNavigateForward});
this.contextMenuCode.Name = "contextMenuWatch";
this.contextMenuCode.Size = new System.Drawing.Size(259, 364);
this.contextMenuCode.Size = new System.Drawing.Size(259, 342);
this.contextMenuCode.Closed += new System.Windows.Forms.ToolStripDropDownClosedEventHandler(this.contextMenuCode_Closed);
this.contextMenuCode.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuCode_Opening);
//
@ -237,10 +237,10 @@
this.mnuHidePrgAddresses.Text = "Hidden";
this.mnuHidePrgAddresses.Click += new System.EventHandler(this.mnuHidePrgAddresses_Click);
//
// toolStripMenuItem2
// sepEditLabel
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(255, 6);
this.sepEditLabel.Name = "sepEditLabel";
this.sepEditLabel.Size = new System.Drawing.Size(255, 6);
//
// mnuEditLabel
//
@ -252,21 +252,22 @@
//
// mnuToggleBreakpoint
//
this.mnuToggleBreakpoint.Image = global::Mesen.GUI.Properties.Resources.Breakpoint;
this.mnuToggleBreakpoint.Name = "mnuToggleBreakpoint";
this.mnuToggleBreakpoint.ShortcutKeyDisplayString = "F9";
this.mnuToggleBreakpoint.Size = new System.Drawing.Size(258, 22);
this.mnuToggleBreakpoint.Text = "Toggle Breakpoint";
this.mnuToggleBreakpoint.Click += new System.EventHandler(this.mnuToggleBreakpoint_Click);
//
// sepBreakpoint
// sepAddToWatch
//
this.sepBreakpoint.Name = "sepBreakpoint";
this.sepBreakpoint.Size = new System.Drawing.Size(255, 6);
this.sepAddToWatch.Name = "sepAddToWatch";
this.sepAddToWatch.Size = new System.Drawing.Size(255, 6);
//
// mnuAddToWatch
//
this.mnuAddToWatch.Name = "mnuAddToWatch";
this.mnuAddToWatch.ShortcutKeyDisplayString = "Shift+Click";
this.mnuAddToWatch.ShortcutKeyDisplayString = "Ctrl+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);
@ -282,7 +283,7 @@
// mnuGoToLocation
//
this.mnuGoToLocation.Name = "mnuGoToLocation";
this.mnuGoToLocation.ShortcutKeyDisplayString = "Ctrl+Click";
this.mnuGoToLocation.ShortcutKeyDisplayString = "Double+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);
@ -334,15 +335,24 @@
// contextMenuMargin
//
this.contextMenuMargin.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mnuEditBreakpoint,
this.mnuDisableBreakpoint,
this.mnuRemoveBreakpoint,
this.mnuEditBreakpoint});
this.mnuRemoveBreakpoint});
this.contextMenuMargin.Name = "contextMenuMargin";
this.contextMenuMargin.Size = new System.Drawing.Size(178, 70);
this.contextMenuMargin.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuMargin_Opening);
//
// mnuEditBreakpoint
//
this.mnuEditBreakpoint.Image = global::Mesen.GUI.Properties.Resources.Edit;
this.mnuEditBreakpoint.Name = "mnuEditBreakpoint";
this.mnuEditBreakpoint.Size = new System.Drawing.Size(177, 22);
this.mnuEditBreakpoint.Text = "Edit breakpoint";
this.mnuEditBreakpoint.Click += new System.EventHandler(this.mnuEditBreakpoint_Click);
//
// mnuDisableBreakpoint
//
this.mnuDisableBreakpoint.Image = global::Mesen.GUI.Properties.Resources.BreakpointEnableDisable;
this.mnuDisableBreakpoint.Name = "mnuDisableBreakpoint";
this.mnuDisableBreakpoint.Size = new System.Drawing.Size(177, 22);
this.mnuDisableBreakpoint.Text = "Disable breakpoint";
@ -350,18 +360,12 @@
//
// mnuRemoveBreakpoint
//
this.mnuRemoveBreakpoint.Image = global::Mesen.GUI.Properties.Resources.Close;
this.mnuRemoveBreakpoint.Name = "mnuRemoveBreakpoint";
this.mnuRemoveBreakpoint.Size = new System.Drawing.Size(177, 22);
this.mnuRemoveBreakpoint.Text = "Remove breakpoint";
this.mnuRemoveBreakpoint.Click += new System.EventHandler(this.mnuRemoveBreakpoint_Click);
//
// mnuEditBreakpoint
//
this.mnuEditBreakpoint.Name = "mnuEditBreakpoint";
this.mnuEditBreakpoint.Size = new System.Drawing.Size(177, 22);
this.mnuEditBreakpoint.Text = "Edit breakpoint";
this.mnuEditBreakpoint.Click += new System.EventHandler(this.mnuEditBreakpoint_Click);
//
// splitContainer
//
this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
@ -495,7 +499,7 @@
private System.Windows.Forms.ToolStripMenuItem mnuShowNextStatement;
private System.Windows.Forms.ToolStripMenuItem mnuSetNextStatement;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
private System.Windows.Forms.ToolStripSeparator sepEditLabel;
private System.Windows.Forms.ToolStripMenuItem mnuGoToLocation;
private System.Windows.Forms.ToolStripMenuItem mnuAddToWatch;
private Mesen.GUI.Debugger.ctrlScrollableTextbox ctrlCodeViewer;
@ -518,7 +522,7 @@
private System.Windows.Forms.ToolStripMenuItem mnuNavigateForward;
private System.Windows.Forms.ToolStripMenuItem mnuNavigateBackward;
private System.Windows.Forms.ToolStripMenuItem mnuEditLabel;
private System.Windows.Forms.ToolStripSeparator sepBreakpoint;
private System.Windows.Forms.ToolStripSeparator sepAddToWatch;
private System.Windows.Forms.ToolStripMenuItem mnuToggleBreakpoint;
private System.Windows.Forms.ToolStripMenuItem mnuShowByteCodeOnLeft;
private System.Windows.Forms.ToolStripMenuItem mnuShowByteCodeBelow;

View file

@ -48,6 +48,7 @@ namespace Mesen.GUI.Debugger
splitContainer.Panel2Collapsed = true;
}
[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public List<ToolStripItem> ContextMenuItems
{
get
@ -523,7 +524,9 @@ namespace Mesen.GUI.Debugger
mnuFindOccurrences.Visible = visible;
mnuEditLabel.Visible = visible;
mnuGoToLocation.Visible = visible;
sepBreakpoint.Visible = visible;
mnuToggleBreakpoint.Visible = visible;
sepAddToWatch.Visible = visible;
sepEditLabel.Visible = visible;
}
int _lastClickedAddress = Int32.MaxValue;
@ -534,8 +537,6 @@ namespace Mesen.GUI.Debugger
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);
@ -579,15 +580,18 @@ namespace Mesen.GUI.Debugger
private void ctrlCodeViewer_MouseDoubleClick(object sender, MouseEventArgs e)
{
int relativeAddress = ctrlCodeViewer.GetLineNumberAtPosition(e.Y);
if(e.Location.X > this.ctrlCodeViewer.CodeMargin / 2 && e.Location.X < this.ctrlCodeViewer.CodeMargin) {
int relativeAddress = ctrlCodeViewer.GetLineNumberAtPosition(e.Y);
if(relativeAddress >= 0) {
AddressTypeInfo info = new AddressTypeInfo();
InteropEmu.DebugGetAbsoluteAddressAndType((UInt32)relativeAddress, ref info);
if(relativeAddress >= 0 && e.Location.X > this.ctrlCodeViewer.CodeMargin / 2 && e.Location.X < this.ctrlCodeViewer.CodeMargin) {
AddressTypeInfo info = new AddressTypeInfo();
InteropEmu.DebugGetAbsoluteAddressAndType((UInt32)relativeAddress, ref info);
if(info.Address >= 0) {
ctrlLabelList.EditLabel((UInt32)info.Address, info.Type);
if(info.Address >= 0) {
ctrlLabelList.EditLabel((UInt32)info.Address, info.Type);
}
}
} else if(UpdateContextMenu(e.Location) && mnuGoToLocation.Enabled) {
GoToLocation();
}
}

View file

@ -35,6 +35,7 @@
this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.mnuEditLabel = new System.Windows.Forms.ToolStripMenuItem();
this.mnuFindOccurrences = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.contextMenuStrip.SuspendLayout();
this.SuspendLayout();
//
@ -79,13 +80,15 @@
//
this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mnuEditLabel,
this.toolStripMenuItem1,
this.mnuFindOccurrences});
this.contextMenuStrip.Name = "contextMenuStrip";
this.contextMenuStrip.Size = new System.Drawing.Size(167, 70);
this.contextMenuStrip.Size = new System.Drawing.Size(167, 76);
this.contextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip_Opening);
//
// mnuEditLabel
//
this.mnuEditLabel.Image = global::Mesen.GUI.Properties.Resources.Edit;
this.mnuEditLabel.Name = "mnuEditLabel";
this.mnuEditLabel.ShortcutKeys = System.Windows.Forms.Keys.F2;
this.mnuEditLabel.Size = new System.Drawing.Size(166, 22);
@ -94,11 +97,17 @@
//
// mnuFindOccurrences
//
this.mnuFindOccurrences.Image = global::Mesen.GUI.Properties.Resources.Find;
this.mnuFindOccurrences.Name = "mnuFindOccurrences";
this.mnuFindOccurrences.Size = new System.Drawing.Size(166, 22);
this.mnuFindOccurrences.Text = "Find Occurrences";
this.mnuFindOccurrences.Click += new System.EventHandler(this.mnuFindOccurrences_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(163, 6);
//
// ctrlFunctionList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -120,5 +129,6 @@
private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
private System.Windows.Forms.ToolStripMenuItem mnuEditLabel;
private System.Windows.Forms.ToolStripMenuItem mnuFindOccurrences;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
}
}

View file

@ -55,6 +55,7 @@
//
// mnuAdd
//
this.mnuAdd.Image = global::Mesen.GUI.Properties.Resources.Add;
this.mnuAdd.Name = "mnuAdd";
this.mnuAdd.ShortcutKeys = System.Windows.Forms.Keys.Insert;
this.mnuAdd.Size = new System.Drawing.Size(166, 22);
@ -63,6 +64,7 @@
//
// mnuEdit
//
this.mnuEdit.Image = global::Mesen.GUI.Properties.Resources.Edit;
this.mnuEdit.Name = "mnuEdit";
this.mnuEdit.ShortcutKeys = System.Windows.Forms.Keys.F2;
this.mnuEdit.Size = new System.Drawing.Size(166, 22);
@ -71,6 +73,7 @@
//
// mnuDelete
//
this.mnuDelete.Image = global::Mesen.GUI.Properties.Resources.Close;
this.mnuDelete.Name = "mnuDelete";
this.mnuDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete;
this.mnuDelete.Size = new System.Drawing.Size(166, 22);
@ -84,6 +87,7 @@
//
// mnuFindOccurrences
//
this.mnuFindOccurrences.Image = global::Mesen.GUI.Properties.Resources.Find;
this.mnuFindOccurrences.Name = "mnuFindOccurrences";
this.mnuFindOccurrences.Size = new System.Drawing.Size(166, 22);
this.mnuFindOccurrences.Text = "Find Occurrences";
@ -118,7 +122,6 @@
// colFunctionAddress
//
this.colFunctionAddress.Text = "CPU Addr";
this.colFunctionAddress.Width = 60;
//
// colMemoryAddress
//

View file

@ -36,8 +36,8 @@
this.colLastColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.contextMenuWatch = new System.Windows.Forms.ContextMenuStrip(this.components);
this.mnuRemoveWatch = new System.Windows.Forms.ToolStripMenuItem();
this.mnuHexDisplay = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.mnuHexDisplay = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuWatch.SuspendLayout();
this.SuspendLayout();
//
@ -91,6 +91,7 @@
//
// mnuRemoveWatch
//
this.mnuRemoveWatch.Image = global::Mesen.GUI.Properties.Resources.Close;
this.mnuRemoveWatch.Name = "mnuRemoveWatch";
this.mnuRemoveWatch.ShortcutKeyDisplayString = "";
this.mnuRemoveWatch.ShortcutKeys = System.Windows.Forms.Keys.Delete;
@ -98,6 +99,11 @@
this.mnuRemoveWatch.Text = "Remove";
this.mnuRemoveWatch.Click += new System.EventHandler(this.mnuRemoveWatch_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 6);
//
// mnuHexDisplay
//
this.mnuHexDisplay.Checked = true;
@ -108,11 +114,6 @@
this.mnuHexDisplay.Text = "Hexadecimal Display";
this.mnuHexDisplay.Click += new System.EventHandler(this.mnuHexDisplay_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 6);
//
// ctrlWatch
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

View file

@ -217,7 +217,7 @@ namespace Mesen.GUI.Debugger
this.ctrlSplitContainerTop.Panel2.Controls.Add(this.tlpFunctionLabelLists);
this.ctrlSplitContainerTop.Panel2MinSize = 150;
this.ctrlSplitContainerTop.Size = new System.Drawing.Size(1260, 390);
this.ctrlSplitContainerTop.SplitterDistance = 885;
this.ctrlSplitContainerTop.SplitterDistance = 879;
this.ctrlSplitContainerTop.SplitterWidth = 7;
this.ctrlSplitContainerTop.TabIndex = 3;
this.ctrlSplitContainerTop.PanelCollapsed += new System.EventHandler(this.ctrlSplitContainerTop_PanelCollapsed);
@ -238,7 +238,7 @@ namespace Mesen.GUI.Debugger
this.tlpTop.Name = "tlpTop";
this.tlpTop.RowCount = 1;
this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tlpTop.Size = new System.Drawing.Size(885, 390);
this.tlpTop.Size = new System.Drawing.Size(879, 390);
this.tlpTop.TabIndex = 2;
//
// ctrlDebuggerCode
@ -247,7 +247,7 @@ namespace Mesen.GUI.Debugger
this.ctrlDebuggerCode.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlDebuggerCode.Location = new System.Drawing.Point(3, 3);
this.ctrlDebuggerCode.Name = "ctrlDebuggerCode";
this.ctrlDebuggerCode.Size = new System.Drawing.Size(447, 384);
this.ctrlDebuggerCode.Size = new System.Drawing.Size(441, 384);
this.ctrlDebuggerCode.TabIndex = 2;
this.ctrlDebuggerCode.OnEditCode += new Mesen.GUI.Debugger.ctrlDebuggerCode.AssemblerEventHandler(this.ctrlDebuggerCode_OnEditCode);
this.ctrlDebuggerCode.OnSetNextStatement += new Mesen.GUI.Debugger.ctrlDebuggerCode.AddressEventHandler(this.ctrlDebuggerCode_OnSetNextStatement);
@ -256,7 +256,7 @@ namespace Mesen.GUI.Debugger
// ctrlConsoleStatus
//
this.ctrlConsoleStatus.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlConsoleStatus.Location = new System.Drawing.Point(453, 0);
this.ctrlConsoleStatus.Location = new System.Drawing.Point(447, 0);
this.ctrlConsoleStatus.Margin = new System.Windows.Forms.Padding(0);
this.ctrlConsoleStatus.Name = "ctrlConsoleStatus";
this.ctrlConsoleStatus.Size = new System.Drawing.Size(432, 390);
@ -267,7 +267,7 @@ namespace Mesen.GUI.Debugger
//
this.ctrlDebuggerCodeSplit.Code = null;
this.ctrlDebuggerCodeSplit.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(456, 3);
this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(450, 3);
this.ctrlDebuggerCodeSplit.Name = "ctrlDebuggerCodeSplit";
this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(1, 384);
this.ctrlDebuggerCodeSplit.TabIndex = 4;
@ -289,7 +289,7 @@ namespace Mesen.GUI.Debugger
this.tlpFunctionLabelLists.RowCount = 2;
this.tlpFunctionLabelLists.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tlpFunctionLabelLists.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tlpFunctionLabelLists.Size = new System.Drawing.Size(368, 390);
this.tlpFunctionLabelLists.Size = new System.Drawing.Size(374, 390);
this.tlpFunctionLabelLists.TabIndex = 5;
//
// grpLabels
@ -298,7 +298,7 @@ namespace Mesen.GUI.Debugger
this.grpLabels.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpLabels.Location = new System.Drawing.Point(3, 198);
this.grpLabels.Name = "grpLabels";
this.grpLabels.Size = new System.Drawing.Size(362, 189);
this.grpLabels.Size = new System.Drawing.Size(368, 189);
this.grpLabels.TabIndex = 6;
this.grpLabels.TabStop = false;
this.grpLabels.Text = "Labels";
@ -308,7 +308,7 @@ namespace Mesen.GUI.Debugger
this.ctrlLabelList.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlLabelList.Location = new System.Drawing.Point(3, 16);
this.ctrlLabelList.Name = "ctrlLabelList";
this.ctrlLabelList.Size = new System.Drawing.Size(356, 170);
this.ctrlLabelList.Size = new System.Drawing.Size(362, 170);
this.ctrlLabelList.TabIndex = 0;
this.ctrlLabelList.OnFindOccurrence += new System.EventHandler(this.ctrlLabelList_OnFindOccurrence);
this.ctrlLabelList.OnLabelSelected += new System.EventHandler(this.ctrlLabelList_OnLabelSelected);
@ -319,7 +319,7 @@ namespace Mesen.GUI.Debugger
this.grpFunctions.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpFunctions.Location = new System.Drawing.Point(3, 3);
this.grpFunctions.Name = "grpFunctions";
this.grpFunctions.Size = new System.Drawing.Size(362, 189);
this.grpFunctions.Size = new System.Drawing.Size(368, 189);
this.grpFunctions.TabIndex = 5;
this.grpFunctions.TabStop = false;
this.grpFunctions.Text = "Functions";
@ -329,7 +329,7 @@ namespace Mesen.GUI.Debugger
this.ctrlFunctionList.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlFunctionList.Location = new System.Drawing.Point(3, 16);
this.ctrlFunctionList.Name = "ctrlFunctionList";
this.ctrlFunctionList.Size = new System.Drawing.Size(356, 170);
this.ctrlFunctionList.Size = new System.Drawing.Size(362, 170);
this.ctrlFunctionList.TabIndex = 0;
this.ctrlFunctionList.OnFindOccurrence += new System.EventHandler(this.ctrlFunctionList_OnFindOccurrence);
this.ctrlFunctionList.OnFunctionSelected += new System.EventHandler(this.ctrlFunctionList_OnFunctionSelected);
@ -454,14 +454,14 @@ namespace Mesen.GUI.Debugger
//
this.mnuSaveRom.Image = global::Mesen.GUI.Properties.Resources.Floppy;
this.mnuSaveRom.Name = "mnuSaveRom";
this.mnuSaveRom.Size = new System.Drawing.Size(151, 22);
this.mnuSaveRom.Size = new System.Drawing.Size(152, 22);
this.mnuSaveRom.Text = "Save ROM as...";
this.mnuSaveRom.Click += new System.EventHandler(this.mnuSaveRom_Click);
//
// toolStripMenuItem14
//
this.toolStripMenuItem14.Name = "toolStripMenuItem14";
this.toolStripMenuItem14.Size = new System.Drawing.Size(148, 6);
this.toolStripMenuItem14.Size = new System.Drawing.Size(149, 6);
//
// mnuWorkspace
//
@ -472,7 +472,7 @@ namespace Mesen.GUI.Debugger
this.mnuAutoLoadDbgFiles,
this.mnuDisableDefaultLabels});
this.mnuWorkspace.Name = "mnuWorkspace";
this.mnuWorkspace.Size = new System.Drawing.Size(151, 22);
this.mnuWorkspace.Size = new System.Drawing.Size(152, 22);
this.mnuWorkspace.Text = "Workspace";
//
// mnuImportLabels
@ -515,13 +515,13 @@ namespace Mesen.GUI.Debugger
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(148, 6);
this.toolStripMenuItem3.Size = new System.Drawing.Size(149, 6);
//
// mnuClose
//
this.mnuClose.Image = global::Mesen.GUI.Properties.Resources.Exit;
this.mnuClose.Name = "mnuClose";
this.mnuClose.Size = new System.Drawing.Size(151, 22);
this.mnuClose.Size = new System.Drawing.Size(152, 22);
this.mnuClose.Text = "Close";
this.mnuClose.Click += new System.EventHandler(this.mnuClose_Click);
//

View file

@ -176,6 +176,7 @@
//
// mnuImport
//
this.mnuImport.Image = global::Mesen.GUI.Properties.Resources.Import;
this.mnuImport.Name = "mnuImport";
this.mnuImport.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.mnuImport.Size = new System.Drawing.Size(181, 22);
@ -184,6 +185,7 @@
//
// mnuExport
//
this.mnuExport.Image = global::Mesen.GUI.Properties.Resources.Export;
this.mnuExport.Name = "mnuExport";
this.mnuExport.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.mnuExport.Size = new System.Drawing.Size(181, 22);
@ -216,6 +218,7 @@
//
// mnuClose
//
this.mnuClose.Image = global::Mesen.GUI.Properties.Resources.Exit;
this.mnuClose.Name = "mnuClose";
this.mnuClose.Size = new System.Drawing.Size(181, 22);
this.mnuClose.Text = "Close";
@ -293,7 +296,7 @@
// mnuFadeSlow
//
this.mnuFadeSlow.Name = "mnuFadeSlow";
this.mnuFadeSlow.Size = new System.Drawing.Size(152, 22);
this.mnuFadeSlow.Size = new System.Drawing.Size(136, 22);
this.mnuFadeSlow.Text = "Slow";
this.mnuFadeSlow.Click += new System.EventHandler(this.mnuFadeSpeed_Click);
//
@ -302,33 +305,33 @@
this.mnuFadeNormal.Checked = true;
this.mnuFadeNormal.CheckState = System.Windows.Forms.CheckState.Checked;
this.mnuFadeNormal.Name = "mnuFadeNormal";
this.mnuFadeNormal.Size = new System.Drawing.Size(152, 22);
this.mnuFadeNormal.Size = new System.Drawing.Size(136, 22);
this.mnuFadeNormal.Text = "Normal";
this.mnuFadeNormal.Click += new System.EventHandler(this.mnuFadeSpeed_Click);
//
// mnuFadeFast
//
this.mnuFadeFast.Name = "mnuFadeFast";
this.mnuFadeFast.Size = new System.Drawing.Size(152, 22);
this.mnuFadeFast.Size = new System.Drawing.Size(136, 22);
this.mnuFadeFast.Text = "Fast";
this.mnuFadeFast.Click += new System.EventHandler(this.mnuFadeSpeed_Click);
//
// mnuFadeNever
//
this.mnuFadeNever.Name = "mnuFadeNever";
this.mnuFadeNever.Size = new System.Drawing.Size(152, 22);
this.mnuFadeNever.Size = new System.Drawing.Size(136, 22);
this.mnuFadeNever.Text = "Do not fade";
this.mnuFadeNever.Click += new System.EventHandler(this.mnuFadeSpeed_Click);
//
// toolStripMenuItem7
//
this.toolStripMenuItem7.Name = "toolStripMenuItem7";
this.toolStripMenuItem7.Size = new System.Drawing.Size(149, 6);
this.toolStripMenuItem7.Size = new System.Drawing.Size(133, 6);
//
// mnuCustomFadeSpeed
//
this.mnuCustomFadeSpeed.Name = "mnuCustomFadeSpeed";
this.mnuCustomFadeSpeed.Size = new System.Drawing.Size(152, 22);
this.mnuCustomFadeSpeed.Size = new System.Drawing.Size(136, 22);
this.mnuCustomFadeSpeed.Text = "Custom...";
this.mnuCustomFadeSpeed.Click += new System.EventHandler(this.mnuCustomFadeSpeed_Click);
//
@ -382,6 +385,7 @@
//
// mnuRefresh
//
this.mnuRefresh.Image = global::Mesen.GUI.Properties.Resources.Reset;
this.mnuRefresh.Name = "mnuRefresh";
this.mnuRefresh.ShortcutKeys = System.Windows.Forms.Keys.F5;
this.mnuRefresh.Size = new System.Drawing.Size(160, 22);
@ -394,6 +398,7 @@
this.mnuIncreaseFontSize,
this.mnuDecreaseFontSize,
this.mnuResetFontSize});
this.fontSizeToolStripMenuItem.Image = global::Mesen.GUI.Properties.Resources.Font;
this.fontSizeToolStripMenuItem.Name = "fontSizeToolStripMenuItem";
this.fontSizeToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
this.fontSizeToolStripMenuItem.Text = "Text Size";
@ -462,6 +467,7 @@
//
// mnuFind
//
this.mnuFind.Image = global::Mesen.GUI.Properties.Resources.Find;
this.mnuFind.Name = "mnuFind";
this.mnuFind.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
this.mnuFind.Size = new System.Drawing.Size(196, 22);
@ -470,6 +476,7 @@
//
// mnuFindNext
//
this.mnuFindNext.Image = global::Mesen.GUI.Properties.Resources.NextArrow;
this.mnuFindNext.Name = "mnuFindNext";
this.mnuFindNext.ShortcutKeys = System.Windows.Forms.Keys.F3;
this.mnuFindNext.Size = new System.Drawing.Size(196, 22);
@ -478,6 +485,7 @@
//
// mnuFindPrev
//
this.mnuFindPrev.Image = global::Mesen.GUI.Properties.Resources.PreviousArrow;
this.mnuFindPrev.Name = "mnuFindPrev";
this.mnuFindPrev.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F3)));
this.mnuFindPrev.Size = new System.Drawing.Size(196, 22);

View file

@ -85,8 +85,9 @@
//
// mnuClose
//
this.mnuClose.Image = global::Mesen.GUI.Properties.Resources.Exit;
this.mnuClose.Name = "mnuClose";
this.mnuClose.Size = new System.Drawing.Size(103, 22);
this.mnuClose.Size = new System.Drawing.Size(152, 22);
this.mnuClose.Text = "Close";
this.mnuClose.Click += new System.EventHandler(this.mnuClose_Click);
//
@ -102,16 +103,17 @@
//
// mnuRefresh
//
this.mnuRefresh.Image = global::Mesen.GUI.Properties.Resources.Reset;
this.mnuRefresh.Name = "mnuRefresh";
this.mnuRefresh.ShortcutKeys = System.Windows.Forms.Keys.F5;
this.mnuRefresh.Size = new System.Drawing.Size(141, 22);
this.mnuRefresh.Size = new System.Drawing.Size(152, 22);
this.mnuRefresh.Text = "Refresh";
this.mnuRefresh.Click += new System.EventHandler(this.mnuRefresh_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(138, 6);
this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
//
// mnuAutoRefresh
//
@ -119,7 +121,7 @@
this.mnuAutoRefresh.CheckOnClick = true;
this.mnuAutoRefresh.CheckState = System.Windows.Forms.CheckState.Checked;
this.mnuAutoRefresh.Name = "mnuAutoRefresh";
this.mnuAutoRefresh.Size = new System.Drawing.Size(141, 22);
this.mnuAutoRefresh.Size = new System.Drawing.Size(152, 22);
this.mnuAutoRefresh.Text = "Auto-refresh";
this.mnuAutoRefresh.Click += new System.EventHandler(this.mnuAutoRefresh_Click);
//
@ -180,7 +182,7 @@
this.tpgSpriteViewer.Controls.Add(this.ctrlSpriteViewer);
this.tpgSpriteViewer.Location = new System.Drawing.Point(4, 22);
this.tpgSpriteViewer.Name = "tpgSpriteViewer";
this.tpgSpriteViewer.Size = new System.Drawing.Size(701, 522);
this.tpgSpriteViewer.Size = new System.Drawing.Size(701, 526);
this.tpgSpriteViewer.TabIndex = 2;
this.tpgSpriteViewer.Text = "Sprite Viewer";
this.tpgSpriteViewer.UseVisualStyleBackColor = true;
@ -190,7 +192,7 @@
this.ctrlSpriteViewer.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlSpriteViewer.Location = new System.Drawing.Point(0, 0);
this.ctrlSpriteViewer.Name = "ctrlSpriteViewer";
this.ctrlSpriteViewer.Size = new System.Drawing.Size(701, 522);
this.ctrlSpriteViewer.Size = new System.Drawing.Size(701, 526);
this.ctrlSpriteViewer.TabIndex = 0;
//
// tpgPaletteViewer
@ -198,7 +200,7 @@
this.tpgPaletteViewer.Controls.Add(this.ctrlPaletteViewer);
this.tpgPaletteViewer.Location = new System.Drawing.Point(4, 22);
this.tpgPaletteViewer.Name = "tpgPaletteViewer";
this.tpgPaletteViewer.Size = new System.Drawing.Size(701, 522);
this.tpgPaletteViewer.Size = new System.Drawing.Size(701, 526);
this.tpgPaletteViewer.TabIndex = 3;
this.tpgPaletteViewer.Text = "Palette Viewer";
this.tpgPaletteViewer.UseVisualStyleBackColor = true;
@ -208,7 +210,7 @@
this.ctrlPaletteViewer.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlPaletteViewer.Location = new System.Drawing.Point(0, 0);
this.ctrlPaletteViewer.Name = "ctrlPaletteViewer";
this.ctrlPaletteViewer.Size = new System.Drawing.Size(701, 522);
this.ctrlPaletteViewer.Size = new System.Drawing.Size(701, 526);
this.ctrlPaletteViewer.TabIndex = 0;
//
// flowLayoutPanel1

View file

@ -353,13 +353,13 @@
this.mnu10000Lines,
this.mnu30000Lines});
this.logLinesToolStripMenuItem.Name = "logLinesToolStripMenuItem";
this.logLinesToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
this.logLinesToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.logLinesToolStripMenuItem.Text = "Line Count";
//
// mnu100Lines
//
this.mnu100Lines.Name = "mnu100Lines";
this.mnu100Lines.Size = new System.Drawing.Size(104, 22);
this.mnu100Lines.Size = new System.Drawing.Size(152, 22);
this.mnu100Lines.Text = "100";
this.mnu100Lines.Click += new System.EventHandler(this.mnu100Lines_Click);
//
@ -368,21 +368,21 @@
this.mnu1000Lines.Checked = true;
this.mnu1000Lines.CheckState = System.Windows.Forms.CheckState.Checked;
this.mnu1000Lines.Name = "mnu1000Lines";
this.mnu1000Lines.Size = new System.Drawing.Size(104, 22);
this.mnu1000Lines.Size = new System.Drawing.Size(152, 22);
this.mnu1000Lines.Text = "1000";
this.mnu1000Lines.Click += new System.EventHandler(this.mnu1000Lines_Click);
//
// mnu10000Lines
//
this.mnu10000Lines.Name = "mnu10000Lines";
this.mnu10000Lines.Size = new System.Drawing.Size(104, 22);
this.mnu10000Lines.Size = new System.Drawing.Size(152, 22);
this.mnu10000Lines.Text = "10000";
this.mnu10000Lines.Click += new System.EventHandler(this.mnu10000Lines_Click);
//
// mnu30000Lines
//
this.mnu30000Lines.Name = "mnu30000Lines";
this.mnu30000Lines.Size = new System.Drawing.Size(104, 22);
this.mnu30000Lines.Size = new System.Drawing.Size(152, 22);
this.mnu30000Lines.Text = "30000";
this.mnu30000Lines.Click += new System.EventHandler(this.mnu30000Lines_Click);
//
@ -392,19 +392,20 @@
this.mnuAutoRefresh.CheckOnClick = true;
this.mnuAutoRefresh.CheckState = System.Windows.Forms.CheckState.Checked;
this.mnuAutoRefresh.Name = "mnuAutoRefresh";
this.mnuAutoRefresh.Size = new System.Drawing.Size(141, 22);
this.mnuAutoRefresh.Size = new System.Drawing.Size(152, 22);
this.mnuAutoRefresh.Text = "Auto-refresh";
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(138, 6);
this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
//
// mnuRefresh
//
this.mnuRefresh.Image = global::Mesen.GUI.Properties.Resources.Reset;
this.mnuRefresh.Name = "mnuRefresh";
this.mnuRefresh.ShortcutKeys = System.Windows.Forms.Keys.F5;
this.mnuRefresh.Size = new System.Drawing.Size(141, 22);
this.mnuRefresh.Size = new System.Drawing.Size(152, 22);
this.mnuRefresh.Text = "Refresh";
this.mnuRefresh.Click += new System.EventHandler(this.mnuRefresh_Click);
//

View file

@ -977,6 +977,7 @@
<None Include="Resources\Chip.png" />
<None Include="Resources\Breakpoint.png" />
<None Include="Resources\BreakpointDisabled.png" />
<None Include="Resources\BreakpointEnableDisable.png" />
<Content Include="Resources\coins.png" />
<None Include="Resources\DipSwitches.png" />
<None Include="Resources\MesenIcon.png" />

View file

@ -110,6 +110,16 @@ namespace Mesen.GUI.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap BreakpointEnableDisable {
get {
object obj = ResourceManager.GetObject("BreakpointEnableDisable", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

View file

@ -286,6 +286,9 @@
<data name="StepOver" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\StepOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="BreakpointEnableDisable" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\BreakpointEnableDisable.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 B