empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Cleanup - Removed step actions from main window

Browse source
This commit is contained in:
Sour 2019-03-12 13:25:53 -04:00
parent 69d4730801
commit 98408d7a4a
4 changed files with 33 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
UI/Debugger/frmDebugger.Designer.cs generated
View file

@ -49,6 +49,7 @@
this.mnuDisableEnableBreakpoint = new System.Windows.Forms.ToolStripMenuItem(); this.mnuDisableEnableBreakpoint = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.mnuRunCpuCycle = new System.Windows.Forms.ToolStripMenuItem(); this.mnuRunCpuCycle = new System.Windows.Forms.ToolStripMenuItem();
this.mnuRun1000Cycles = new System.Windows.Forms.ToolStripMenuItem();
this.mnuRunPpuCycle = new System.Windows.Forms.ToolStripMenuItem(); this.mnuRunPpuCycle = new System.Windows.Forms.ToolStripMenuItem();
this.mnuRunScanline = new System.Windows.Forms.ToolStripMenuItem(); this.mnuRunScanline = new System.Windows.Forms.ToolStripMenuItem();
this.mnuRunOneFrame = new System.Windows.Forms.ToolStripMenuItem(); this.mnuRunOneFrame = new System.Windows.Forms.ToolStripMenuItem();
@ -108,6 +109,7 @@
this.mnuDisableEnableBreakpoint, this.mnuDisableEnableBreakpoint,
this.toolStripMenuItem2, this.toolStripMenuItem2,
this.mnuRunCpuCycle, this.mnuRunCpuCycle,
this.mnuRun1000Cycles,
this.mnuRunPpuCycle, this.mnuRunPpuCycle,
this.mnuRunScanline, this.mnuRunScanline,
this.mnuRunOneFrame, this.mnuRunOneFrame,
@ -219,6 +221,14 @@
this.mnuRunCpuCycle.Size = new System.Drawing.Size(212, 22); this.mnuRunCpuCycle.Size = new System.Drawing.Size(212, 22);
this.mnuRunCpuCycle.Text = "Run one CPU cycle"; this.mnuRunCpuCycle.Text = "Run one CPU cycle";
// //
// mnuRun1000Cycles
//
this.mnuRun1000Cycles.Name = "mnuRun1000Cycles";
this.mnuRun1000Cycles.ShortcutKeys = System.Windows.Forms.Keys.F9;
this.mnuRun1000Cycles.Size = new System.Drawing.Size(212, 22);
this.mnuRun1000Cycles.Text = "Run 1000 CPU cycles";
this.mnuRun1000Cycles.Click += new System.EventHandler(this.mnuRun1000Cycles_Click);
//
// mnuRunPpuCycle // mnuRunPpuCycle
// //
this.mnuRunPpuCycle.Image = global::Mesen.GUI.Properties.Resources.RunPpuCycle; this.mnuRunPpuCycle.Image = global::Mesen.GUI.Properties.Resources.RunPpuCycle;
@ -395,5 +405,6 @@
private System.Windows.Forms.GroupBox grpBreakpoints; private System.Windows.Forms.GroupBox grpBreakpoints;
private Controls.ctrlBreakpoints ctrlBreakpoints; private Controls.ctrlBreakpoints ctrlBreakpoints;
private Controls.ctrlConsoleStatus ctrlStatus; private Controls.ctrlConsoleStatus ctrlStatus;
private System.Windows.Forms.ToolStripMenuItem mnuRun1000Cycles;
} }
} }

5
UI/Debugger/frmDebugger.cs
View file

@ -92,5 +92,10 @@ namespace Mesen.GUI.Debugger
{ {
DebugApi.ResumeExecution(); DebugApi.ResumeExecution();
} }
private void mnuRun1000Cycles_Click(object sender, EventArgs e)
{
DebugApi.Step(1000);
}
} }
} }

72
UI/Forms/frmMain.Designer.cs generated
View file

@ -101,6 +101,7 @@
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
this.mnuAudioConfig = new System.Windows.Forms.ToolStripMenuItem(); this.mnuAudioConfig = new System.Windows.Forms.ToolStripMenuItem();
this.mnuVideoConfig = new System.Windows.Forms.ToolStripMenuItem(); this.mnuVideoConfig = new System.Windows.Forms.ToolStripMenuItem();
this.mnuEmulationConfig = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
this.mnuPreferences = new System.Windows.Forms.ToolStripMenuItem(); this.mnuPreferences = new System.Windows.Forms.ToolStripMenuItem();
this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -108,10 +109,6 @@
this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator();
this.mnuTakeScreenshot = new System.Windows.Forms.ToolStripMenuItem(); this.mnuTakeScreenshot = new System.Windows.Forms.ToolStripMenuItem();
this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mnuRun = new System.Windows.Forms.ToolStripMenuItem();
this.mnuStep = new System.Windows.Forms.ToolStripMenuItem();
this.mnuRun100Instructions = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.mnuDebugger = new System.Windows.Forms.ToolStripMenuItem(); this.mnuDebugger = new System.Windows.Forms.ToolStripMenuItem();
this.mnuMemoryTools = new System.Windows.Forms.ToolStripMenuItem(); this.mnuMemoryTools = new System.Windows.Forms.ToolStripMenuItem();
this.mnuTraceLogger = new System.Windows.Forms.ToolStripMenuItem(); this.mnuTraceLogger = new System.Windows.Forms.ToolStripMenuItem();
@ -124,7 +121,6 @@
this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator();
this.mnuAbout = new System.Windows.Forms.ToolStripMenuItem(); this.mnuAbout = new System.Windows.Forms.ToolStripMenuItem();
this.pnlRenderer = new System.Windows.Forms.Panel(); this.pnlRenderer = new System.Windows.Forms.Panel();
this.mnuEmulationConfig = new System.Windows.Forms.ToolStripMenuItem();
this.mnuMain.SuspendLayout(); this.mnuMain.SuspendLayout();
this.pnlRenderer.SuspendLayout(); this.pnlRenderer.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
@ -245,6 +241,7 @@
this.mnuReset.Name = "mnuReset"; this.mnuReset.Name = "mnuReset";
this.mnuReset.Size = new System.Drawing.Size(152, 22); this.mnuReset.Size = new System.Drawing.Size(152, 22);
this.mnuReset.Text = "Reset"; this.mnuReset.Text = "Reset";
this.mnuReset.Visible = false;
// //
// mnuPowerCycle // mnuPowerCycle
// //
@ -253,6 +250,7 @@
this.mnuPowerCycle.Name = "mnuPowerCycle"; this.mnuPowerCycle.Name = "mnuPowerCycle";
this.mnuPowerCycle.Size = new System.Drawing.Size(152, 22); this.mnuPowerCycle.Size = new System.Drawing.Size(152, 22);
this.mnuPowerCycle.Text = "Power Cycle"; this.mnuPowerCycle.Text = "Power Cycle";
this.mnuPowerCycle.Visible = false;
// //
// toolStripMenuItem24 // toolStripMenuItem24
// //
@ -672,6 +670,14 @@
this.mnuVideoConfig.Text = "Video"; this.mnuVideoConfig.Text = "Video";
this.mnuVideoConfig.Click += new System.EventHandler(this.mnuVideoConfig_Click); this.mnuVideoConfig.Click += new System.EventHandler(this.mnuVideoConfig_Click);
// //
// mnuEmulationConfig
//
this.mnuEmulationConfig.Image = global::Mesen.GUI.Properties.Resources.DipSwitches;
this.mnuEmulationConfig.Name = "mnuEmulationConfig";
this.mnuEmulationConfig.Size = new System.Drawing.Size(152, 22);
this.mnuEmulationConfig.Text = "Emulation";
this.mnuEmulationConfig.Click += new System.EventHandler(this.mnuEmulationConfig_Click);
//
// toolStripMenuItem3 // toolStripMenuItem3
// //
this.toolStripMenuItem3.Name = "toolStripMenuItem3"; this.toolStripMenuItem3.Name = "toolStripMenuItem3";
@ -718,10 +724,6 @@
// debugToolStripMenuItem // debugToolStripMenuItem
// //
this.debugToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.debugToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mnuRun,
this.mnuStep,
this.mnuRun100Instructions,
this.toolStripMenuItem1,
this.mnuDebugger, this.mnuDebugger,
this.mnuMemoryTools, this.mnuMemoryTools,
this.mnuTraceLogger, this.mnuTraceLogger,
@ -731,40 +733,11 @@
this.debugToolStripMenuItem.Size = new System.Drawing.Size(54, 20); this.debugToolStripMenuItem.Size = new System.Drawing.Size(54, 20);
this.debugToolStripMenuItem.Text = "Debug"; this.debugToolStripMenuItem.Text = "Debug";
// //
// mnuRun
//
this.mnuRun.Name = "mnuRun";
this.mnuRun.ShortcutKeys = System.Windows.Forms.Keys.F5;
this.mnuRun.Size = new System.Drawing.Size(163, 22);
this.mnuRun.Text = "Run";
this.mnuRun.Click += new System.EventHandler(this.mnuRun_Click);
//
// mnuStep
//
this.mnuStep.Name = "mnuStep";
this.mnuStep.ShortcutKeys = System.Windows.Forms.Keys.F11;
this.mnuStep.Size = new System.Drawing.Size(163, 22);
this.mnuStep.Text = "Step";
this.mnuStep.Click += new System.EventHandler(this.mnuStep_Click);
//
// mnuRun100Instructions
//
this.mnuRun100Instructions.Name = "mnuRun100Instructions";
this.mnuRun100Instructions.ShortcutKeys = System.Windows.Forms.Keys.F6;
this.mnuRun100Instructions.Size = new System.Drawing.Size(163, 22);
this.mnuRun100Instructions.Text = "Run 1000 ops";
this.mnuRun100Instructions.Click += new System.EventHandler(this.mnuRun100Instructions_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(160, 6);
//
// mnuDebugger // mnuDebugger
// //
this.mnuDebugger.Image = global::Mesen.GUI.Properties.Resources.Debugger; this.mnuDebugger.Image = global::Mesen.GUI.Properties.Resources.Debugger;
this.mnuDebugger.Name = "mnuDebugger"; this.mnuDebugger.Name = "mnuDebugger";
this.mnuDebugger.Size = new System.Drawing.Size(163, 22); this.mnuDebugger.Size = new System.Drawing.Size(155, 22);
this.mnuDebugger.Text = "Debugger"; this.mnuDebugger.Text = "Debugger";
this.mnuDebugger.Click += new System.EventHandler(this.mnuDebugger_Click); this.mnuDebugger.Click += new System.EventHandler(this.mnuDebugger_Click);
// //
@ -772,7 +745,7 @@
// //
this.mnuMemoryTools.Image = global::Mesen.GUI.Properties.Resources.CheatCode; this.mnuMemoryTools.Image = global::Mesen.GUI.Properties.Resources.CheatCode;
this.mnuMemoryTools.Name = "mnuMemoryTools"; this.mnuMemoryTools.Name = "mnuMemoryTools";
this.mnuMemoryTools.Size = new System.Drawing.Size(163, 22); this.mnuMemoryTools.Size = new System.Drawing.Size(155, 22);
this.mnuMemoryTools.Text = "Memory Tools"; this.mnuMemoryTools.Text = "Memory Tools";
this.mnuMemoryTools.Click += new System.EventHandler(this.mnuMemoryTools_Click); this.mnuMemoryTools.Click += new System.EventHandler(this.mnuMemoryTools_Click);
// //
@ -780,7 +753,7 @@
// //
this.mnuTraceLogger.Image = global::Mesen.GUI.Properties.Resources.LogWindow; this.mnuTraceLogger.Image = global::Mesen.GUI.Properties.Resources.LogWindow;
this.mnuTraceLogger.Name = "mnuTraceLogger"; this.mnuTraceLogger.Name = "mnuTraceLogger";
this.mnuTraceLogger.Size = new System.Drawing.Size(163, 22); this.mnuTraceLogger.Size = new System.Drawing.Size(155, 22);
this.mnuTraceLogger.Text = "Trace Logger"; this.mnuTraceLogger.Text = "Trace Logger";
this.mnuTraceLogger.Click += new System.EventHandler(this.mnuTraceLogger_Click); this.mnuTraceLogger.Click += new System.EventHandler(this.mnuTraceLogger_Click);
// //
@ -788,7 +761,7 @@
// //
this.mnuTilemapViewer.Image = global::Mesen.GUI.Properties.Resources.VideoOptions; this.mnuTilemapViewer.Image = global::Mesen.GUI.Properties.Resources.VideoOptions;
this.mnuTilemapViewer.Name = "mnuTilemapViewer"; this.mnuTilemapViewer.Name = "mnuTilemapViewer";
this.mnuTilemapViewer.Size = new System.Drawing.Size(163, 22); this.mnuTilemapViewer.Size = new System.Drawing.Size(155, 22);
this.mnuTilemapViewer.Text = "Tilemap Viewer"; this.mnuTilemapViewer.Text = "Tilemap Viewer";
this.mnuTilemapViewer.Click += new System.EventHandler(this.mnuTilemapViewer_Click); this.mnuTilemapViewer.Click += new System.EventHandler(this.mnuTilemapViewer_Click);
// //
@ -796,7 +769,7 @@
// //
this.mnuEventViewer.Image = global::Mesen.GUI.Properties.Resources.NesEventViewer; this.mnuEventViewer.Image = global::Mesen.GUI.Properties.Resources.NesEventViewer;
this.mnuEventViewer.Name = "mnuEventViewer"; this.mnuEventViewer.Name = "mnuEventViewer";
this.mnuEventViewer.Size = new System.Drawing.Size(163, 22); this.mnuEventViewer.Size = new System.Drawing.Size(155, 22);
this.mnuEventViewer.Text = "Event Viewer"; this.mnuEventViewer.Text = "Event Viewer";
this.mnuEventViewer.Click += new System.EventHandler(this.mnuEventViewer_Click); this.mnuEventViewer.Click += new System.EventHandler(this.mnuEventViewer_Click);
// //
@ -811,6 +784,7 @@
this.mnuHelp.Name = "mnuHelp"; this.mnuHelp.Name = "mnuHelp";
this.mnuHelp.Size = new System.Drawing.Size(44, 20); this.mnuHelp.Size = new System.Drawing.Size(44, 20);
this.mnuHelp.Text = "Help"; this.mnuHelp.Text = "Help";
this.mnuHelp.Visible = false;
// //
// mnuCheckForUpdates // mnuCheckForUpdates
// //
@ -852,14 +826,6 @@
this.pnlRenderer.Size = new System.Drawing.Size(512, 448); this.pnlRenderer.Size = new System.Drawing.Size(512, 448);
this.pnlRenderer.TabIndex = 2; this.pnlRenderer.TabIndex = 2;
// //
// mnuEmulationConfig
//
this.mnuEmulationConfig.Image = global::Mesen.GUI.Properties.Resources.DipSwitches;
this.mnuEmulationConfig.Name = "mnuEmulationConfig";
this.mnuEmulationConfig.Size = new System.Drawing.Size(152, 22);
this.mnuEmulationConfig.Text = "Emulation";
this.mnuEmulationConfig.Click += new System.EventHandler(this.mnuEmulationConfig_Click);
//
// frmMain // frmMain
// //
this.AllowDrop = true; this.AllowDrop = true;
@ -886,12 +852,8 @@
private System.Windows.Forms.ToolStripMenuItem debugToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem debugToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mnuDebugger; private System.Windows.Forms.ToolStripMenuItem mnuDebugger;
private System.Windows.Forms.ToolStripMenuItem mnuTraceLogger; private System.Windows.Forms.ToolStripMenuItem mnuTraceLogger;
private System.Windows.Forms.ToolStripMenuItem mnuStep;
private System.Windows.Forms.ToolStripMenuItem mnuFile; private System.Windows.Forms.ToolStripMenuItem mnuFile;
private System.Windows.Forms.ToolStripMenuItem mnuOpen; private System.Windows.Forms.ToolStripMenuItem mnuOpen;
private System.Windows.Forms.ToolStripMenuItem mnuRun;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem mnuRun100Instructions;
private System.Windows.Forms.ToolStripMenuItem mnuMemoryTools; private System.Windows.Forms.ToolStripMenuItem mnuMemoryTools;
private System.Windows.Forms.ToolStripMenuItem mnuTilemapViewer; private System.Windows.Forms.ToolStripMenuItem mnuTilemapViewer;
private System.Windows.Forms.ToolStripMenuItem mnuEventViewer; private System.Windows.Forms.ToolStripMenuItem mnuEventViewer;

15
UI/Forms/frmMain.cs
View file

@ -232,21 +232,6 @@ namespace Mesen.GUI.Forms
DebugWindowManager.OpenDebugWindow(DebugWindow.EventViewer); DebugWindowManager.OpenDebugWindow(DebugWindow.EventViewer);
} }
private void mnuStep_Click(object sender, EventArgs e)
{
DebugApi.Step(1);
}
private void mnuRun_Click(object sender, EventArgs e)
{
DebugApi.ResumeExecution();
}
private void mnuRun100Instructions_Click(object sender, EventArgs e)
{
DebugApi.Step(1000);
}
protected override void OnDragDrop(DragEventArgs e) protected override void OnDragDrop(DragEventArgs e)
{ {
base.OnDragDrop(e); base.OnDragDrop(e);