Debugger: Added some icons to menu

GUI.NET/Debugger/frmDebugger.Designer.cs

@@ -127,6 +127,7 @@ namespace Mesen.GUI.Debugger
 			this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator();
 			this.mnuPpuPartialDraw = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.mnuAssembler = new System.Windows.Forms.ToolStripMenuItem();
 			this.mnuMemoryViewer = new System.Windows.Forms.ToolStripMenuItem();
 			this.mnuPpuViewer = new System.Windows.Forms.ToolStripMenuItem();
 			this.mnuTraceLogger = new System.Windows.Forms.ToolStripMenuItem();
@@ -147,7 +148,6 @@ namespace Mesen.GUI.Debugger
 			this.lblChrAnalysisResult = new System.Windows.Forms.ToolStripStatusLabel();
 			this.ctrlPpuMemoryMapping = new Mesen.GUI.Debugger.Controls.ctrlMemoryMapping();
 			this.ctrlCpuMemoryMapping = new Mesen.GUI.Debugger.Controls.ctrlMemoryMapping();
-			this.mnuAssembler = new System.Windows.Forms.ToolStripMenuItem();
 			((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
 			this.splitContainer.Panel1.SuspendLayout();
 			this.splitContainer.Panel2.SuspendLayout();
@@ -216,7 +216,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 = 924;
+			this.ctrlSplitContainerTop.SplitterDistance = 894;
 			this.ctrlSplitContainerTop.SplitterWidth = 7;
 			this.ctrlSplitContainerTop.TabIndex = 3;
 			this.ctrlSplitContainerTop.PanelCollapsed += new System.EventHandler(this.ctrlSplitContainerTop_PanelCollapsed);
@@ -237,15 +237,16 @@ 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(924, 390);
+			this.tlpTop.Size = new System.Drawing.Size(894, 390);
 			this.tlpTop.TabIndex = 2;
 			// 
 			// ctrlDebuggerCode
 			// 
+			this.ctrlDebuggerCode.Code = null;
 			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(486, 384);
+			this.ctrlDebuggerCode.Size = new System.Drawing.Size(456, 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);
@@ -254,7 +255,7 @@ namespace Mesen.GUI.Debugger
 			// ctrlConsoleStatus
 			// 
 			this.ctrlConsoleStatus.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.ctrlConsoleStatus.Location = new System.Drawing.Point(492, 0);
+			this.ctrlConsoleStatus.Location = new System.Drawing.Point(462, 0);
 			this.ctrlConsoleStatus.Margin = new System.Windows.Forms.Padding(0);
 			this.ctrlConsoleStatus.Name = "ctrlConsoleStatus";
 			this.ctrlConsoleStatus.Size = new System.Drawing.Size(432, 390);
@@ -263,8 +264,9 @@ namespace Mesen.GUI.Debugger
 			// 
 			// ctrlDebuggerCodeSplit
 			// 
+			this.ctrlDebuggerCodeSplit.Code = null;
 			this.ctrlDebuggerCodeSplit.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(495, 3);
+			this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(465, 3);
 			this.ctrlDebuggerCodeSplit.Name = "ctrlDebuggerCodeSplit";
 			this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(1, 384);
 			this.ctrlDebuggerCodeSplit.TabIndex = 4;
@@ -286,7 +288,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(329, 390);
+			this.tlpFunctionLabelLists.Size = new System.Drawing.Size(359, 390);
 			this.tlpFunctionLabelLists.TabIndex = 5;
 			// 
 			// grpLabels
@@ -295,7 +297,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(323, 189);
+			this.grpLabels.Size = new System.Drawing.Size(353, 189);
 			this.grpLabels.TabIndex = 6;
 			this.grpLabels.TabStop = false;
 			this.grpLabels.Text = "Labels";
@@ -305,7 +307,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(317, 170);
+			this.ctrlLabelList.Size = new System.Drawing.Size(347, 170);
 			this.ctrlLabelList.TabIndex = 0;
 			this.ctrlLabelList.OnFindOccurrence += new System.EventHandler(this.ctrlLabelList_OnFindOccurrence);
 			this.ctrlLabelList.OnLabelSelected += new System.EventHandler(this.ctrlLabelList_OnLabelSelected);
@@ -316,7 +318,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(323, 189);
+			this.grpFunctions.Size = new System.Drawing.Size(353, 189);
 			this.grpFunctions.TabIndex = 5;
 			this.grpFunctions.TabStop = false;
 			this.grpFunctions.Text = "Functions";
@@ -326,7 +328,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(317, 170);
+			this.ctrlFunctionList.Size = new System.Drawing.Size(347, 170);
 			this.ctrlFunctionList.TabIndex = 0;
 			this.ctrlFunctionList.OnFindOccurrence += new System.EventHandler(this.ctrlFunctionList_OnFindOccurrence);
 			this.ctrlFunctionList.OnFunctionSelected += new System.EventHandler(this.ctrlFunctionList_OnFunctionSelected);
@@ -564,6 +566,7 @@ namespace Mesen.GUI.Debugger
 			// 
 			// mnuStepInto
 			// 
+			this.mnuStepInto.Image = global::Mesen.GUI.Properties.Resources.StepInto;
 			this.mnuStepInto.Name = "mnuStepInto";
 			this.mnuStepInto.ShortcutKeys = System.Windows.Forms.Keys.F11;
 			this.mnuStepInto.Size = new System.Drawing.Size(258, 22);
@@ -572,6 +575,7 @@ namespace Mesen.GUI.Debugger
 			// 
 			// mnuStepOver
 			// 
+			this.mnuStepOver.Image = global::Mesen.GUI.Properties.Resources.StepOver;
 			this.mnuStepOver.Name = "mnuStepOver";
 			this.mnuStepOver.ShortcutKeys = System.Windows.Forms.Keys.F10;
 			this.mnuStepOver.Size = new System.Drawing.Size(258, 22);
@@ -580,6 +584,7 @@ namespace Mesen.GUI.Debugger
 			// 
 			// mnuStepOut
 			// 
+			this.mnuStepOut.Image = global::Mesen.GUI.Properties.Resources.StepOut;
 			this.mnuStepOut.Name = "mnuStepOut";
 			this.mnuStepOut.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F11)));
 			this.mnuStepOut.Size = new System.Drawing.Size(258, 22);
@@ -593,6 +598,7 @@ namespace Mesen.GUI.Debugger
 			// 
 			// mnuToggleBreakpoint
 			// 
+			this.mnuToggleBreakpoint.Image = global::Mesen.GUI.Properties.Resources.Breakpoint;
 			this.mnuToggleBreakpoint.Name = "mnuToggleBreakpoint";
 			this.mnuToggleBreakpoint.ShortcutKeys = System.Windows.Forms.Keys.F9;
 			this.mnuToggleBreakpoint.Size = new System.Drawing.Size(258, 22);
@@ -601,6 +607,7 @@ namespace Mesen.GUI.Debugger
 			// 
 			// mnuDisableEnableBreakpoint
 			// 
+			this.mnuDisableEnableBreakpoint.Image = global::Mesen.GUI.Properties.Resources.BreakpointDisabled;
 			this.mnuDisableEnableBreakpoint.Name = "mnuDisableEnableBreakpoint";
 			this.mnuDisableEnableBreakpoint.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F9)));
 			this.mnuDisableEnableBreakpoint.Size = new System.Drawing.Size(258, 22);
@@ -664,6 +671,7 @@ namespace Mesen.GUI.Debugger
 			// 
 			// 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(255, 22);
@@ -672,6 +680,7 @@ namespace Mesen.GUI.Debugger
 			// 
 			// 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(255, 22);
@@ -680,6 +689,7 @@ namespace Mesen.GUI.Debugger
 			// 
 			// 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(255, 22);
@@ -852,6 +862,7 @@ namespace Mesen.GUI.Debugger
 			// mnuSplitView
 			// 
 			this.mnuSplitView.CheckOnClick = true;
+			this.mnuSplitView.Image = global::Mesen.GUI.Properties.Resources.SplitView;
 			this.mnuSplitView.Name = "mnuSplitView";
 			this.mnuSplitView.Size = new System.Drawing.Size(259, 22);
 			this.mnuSplitView.Text = "Split View";
@@ -863,6 +874,7 @@ namespace Mesen.GUI.Debugger
             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(259, 22);
 			this.fontSizeToolStripMenuItem.Text = "Text Size";
@@ -984,16 +996,25 @@ namespace Mesen.GUI.Debugger
 			// toolsToolStripMenuItem
 			// 
 			this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.mnuAssembler,
             this.mnuMemoryViewer,
             this.mnuPpuViewer,
             this.mnuTraceLogger,
-            this.mnuAssembler,
             this.toolStripMenuItem13,
             this.mnuCodeDataLogger});
 			this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
 			this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
 			this.toolsToolStripMenuItem.Text = "Tools";
 			// 
+			// mnuAssembler
+			// 
+			this.mnuAssembler.Image = global::Mesen.GUI.Properties.Resources.Chip;
+			this.mnuAssembler.Name = "mnuAssembler";
+			this.mnuAssembler.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.K)));
+			this.mnuAssembler.Size = new System.Drawing.Size(196, 22);
+			this.mnuAssembler.Text = "Assembler";
+			this.mnuAssembler.Click += new System.EventHandler(this.mnuAssembler_Click);
+			// 
 			// mnuMemoryViewer
 			// 
 			this.mnuMemoryViewer.Image = global::Mesen.GUI.Properties.Resources.CheatCode;
@@ -1156,13 +1177,6 @@ namespace Mesen.GUI.Debugger
 			this.ctrlCpuMemoryMapping.Text = "ctrlMemoryMapping1";
 			this.ctrlCpuMemoryMapping.Visible = false;
 			// 
-			// mnuAssembler
-			// 
-			this.mnuAssembler.Name = "mnuAssembler";
-			this.mnuAssembler.Size = new System.Drawing.Size(196, 22);
-			this.mnuAssembler.Text = "Assembler";
-			this.mnuAssembler.Click += new System.EventHandler(this.mnuAssembler_Click);
-			// 
 			// frmDebugger
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

GUI.NET/GUI.NET.csproj

@@ -947,6 +947,12 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Icon.ico" />
+    <None Include="Resources\StepOut.png" />
+    <None Include="Resources\StepInto.png" />
+    <None Include="Resources\StepOver.png" />
+    <None Include="Resources\find.png" />
+    <None Include="Resources\SplitView.png" />
+    <None Include="Resources\font.png" />
     <None Include="Resources\Edit.png" />
     <None Include="Resources\pencil.png" />
     <None Include="Resources\pipette.png" />
@@ -967,6 +973,9 @@
     <None Include="Resources\Add.png" />
     <None Include="Resources\CheatCode.png" />
     <None Include="Resources\bug.png" />
+    <None Include="Resources\Chip.png" />
+    <None Include="Resources\Breakpoint.png" />
+    <None Include="Resources\BreakpointDisabled.png" />
     <Content Include="Resources\coins.png" />
     <None Include="Resources\DipSwitches.png" />
     <None Include="Resources\MesenIcon.png" />

GUI.NET/Properties/Resources.Designer.cs

@@ -90,6 +90,26 @@ namespace Mesen.GUI.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Breakpoint {
+            get {
+                object obj = ResourceManager.GetObject("Breakpoint", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap BreakpointDisabled {
+            get {
+                object obj = ResourceManager.GetObject("BreakpointDisabled", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -120,6 +140,16 @@ namespace Mesen.GUI.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Chip {
+            get {
+                object obj = ResourceManager.GetObject("Chip", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -240,6 +270,16 @@ namespace Mesen.GUI.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Find {
+            get {
+                object obj = ResourceManager.GetObject("Find", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -260,6 +300,16 @@ namespace Mesen.GUI.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Font {
+            get {
+                object obj = ResourceManager.GetObject("Font", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -490,6 +540,46 @@ namespace Mesen.GUI.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SplitView {
+            get {
+                object obj = ResourceManager.GetObject("SplitView", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap StepInto {
+            get {
+                object obj = ResourceManager.GetObject("StepInto", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap StepOut {
+            get {
+                object obj = ResourceManager.GetObject("StepOut", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap StepOver {
+            get {
+                object obj = ResourceManager.GetObject("StepOver", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

GUI.NET/Properties/Resources.resx

@@ -259,4 +259,31 @@
   <data name="Edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Breakpoint" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Breakpoint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="BreakpointDisabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BreakpointDisabled.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Chip" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Chip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Find" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\find.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Font" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\font.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SplitView" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SplitView.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="StepInto" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\StepInto.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="StepOut" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\StepOut.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <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>
 </root>