From 4c34a75332dc493f15e6b346ccdb5028b5a9cd37 Mon Sep 17 00:00:00 2001 From: thrust26 Date: Sun, 19 Apr 2020 10:45:22 +0200 Subject: [PATCH] renamed 'Exit' button in debugger into 'Run' (TODO: update screenshots) (fixes #614) --- docs/debugger.html | 20 ++++++++++---------- src/debugger/gui/DebuggerDialog.cxx | 4 ++-- src/debugger/gui/DebuggerDialog.hxx | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/debugger.html b/docs/debugger.html index 46e38d079..4f0c1cf6f 100644 --- a/docs/debugger.html +++ b/docs/debugger.html @@ -331,7 +331,7 @@ previous rewind operation. The rewind buffer is 100 levels deep by default, the size can be configured e.g. in the Developer Settings - Time Machine dialog.

-

The other operations are Step, Trace, Scan+1, Frame+1 and Exit (debugger).

+

The other operations are Step, Trace, Scan+1, Frame+1 and Run.

You can also use the buttons from anywhere in the GUI via hotkeys.

@@ -382,12 +382,12 @@ size can be configured e.g. in the Backquote (`) - Exit + Run

For MacOS use 'Cmd' instead of  'Alt' key. -

To the left of the global buttons, you find the "Options..." button.

+

To the left of the global buttons, you find the 'Options...' button.

@@ -608,7 +608,7 @@ created a symbol file, you can use labels for the expression.

Example: You have got a label called "kernel". To break there, the command is "break kernel". After you've set the breakpoint, -exit the debugger ("quit" or click the Exit button). The emulator +exit the debugger (enter "run" or click the 'Run' button). The emulator will run until it gets to the breakpoint, then it will enter the debugger with the Program Counter pointing to the instruction at the breakpoint.

@@ -1027,8 +1027,8 @@ graphics and positions, and the playfield.

of the displays are editable. You can even toggle individual bits in the GRP0/1 and playfield registers (remember to double-click).

-

The group of buttons labelled "Strobes" allows you to write to any -of the strobe registers at any time.

+

The buttons allow you to write to any of the strobe registers at +any time.

The collision registers are displayed in decoded format, in a table. You can see exactly which objects have hit what. These are read-only @@ -1103,7 +1103,7 @@ or TV effects are enabled, you won't see the effects here; this shows the raw TIA image only.

To e.g. watch the TIA draw the frame one scanline at a time, you can -use the "Scan+1" button, the prompt "scan" command or the Control-L key.

+use the 'Scan+1' button, the prompt "scan" command or the Control-L key.

You can also right-click anywhere in this window to show a context menu, as illustrated:

@@ -1213,7 +1213,7 @@ section for details.

All the registers and flags are displayed, and can be changed by double-clicking on them (to the left). Flags are toggled on double-click. -Selected registers here can also be changed by using the "Data Operations" buttons, +Selected registers here can also be changed by using the 'Data Operations' buttons, further described in (J). All items are shown in hex. Any label defined for the current PC value is shown to the right. Decimal and binary equivalents are shown for SP/A/X/Y to the right (first decimal, then binary).

@@ -1631,7 +1631,7 @@ but it helps to know at least a little about 6502 programming.

  • Enter the debugger by pressing the ` (backquote) key. Don't get killed before you do this, though. You should still have all 5 lives.
    • -
  • In the RAM display, click the "Search" button and enter "5" for input. +
  • In the RAM display, click the 'Search' button and enter "5" for input. This searches RAM for your value and highlights all addresses that match the input. You should see two addresses highlighted: "00a5" and "00ba". These are the only two addresses that currently have the value 5, so they're @@ -1647,7 +1647,7 @@ but it helps to know at least a little about 6502 programming.

  • Get killed! Ram an enemy tank, or let him shoot you. Wait for the explosion to finish. You will now have 4 lives.
    • -
  • Enter the debugger again. Click the "Compare" button in RAM widget and enter +
  • Enter the debugger again. Click the 'Compare...' button in RAM widget and enter a value of 4. Now the RAM widget should only show one highlighted address: "00ba". What we did was search within our previous results (the ones that were 5 before) for the new value 4. Address $00ba used to have the value 5, diff --git a/src/debugger/gui/DebuggerDialog.cxx b/src/debugger/gui/DebuggerDialog.cxx index 47e05da04..ac3c8d6c9 100644 --- a/src/debugger/gui/DebuggerDialog.cxx +++ b/src/debugger/gui/DebuggerDialog.cxx @@ -231,7 +231,7 @@ void DebuggerDialog::handleCommand(CommandSender* sender, int cmd, doUnwind(); break; - case kDDExitCmd: + case kDDRunCmd: doExitDebugger(); break; @@ -541,7 +541,7 @@ void DebuggerDialog::addRomArea() wid2.push_back(b); buttonY += bheight + 4; b = new ButtonWidget(this, *myLFont, buttonX, buttonY, - bwidth, bheight, "Exit", kDDExitCmd); + bwidth, bheight, "Run", kDDRunCmd); wid2.push_back(b); addCancelWidget(b); diff --git a/src/debugger/gui/DebuggerDialog.hxx b/src/debugger/gui/DebuggerDialog.hxx index f9f11e459..b1b42211a 100644 --- a/src/debugger/gui/DebuggerDialog.hxx +++ b/src/debugger/gui/DebuggerDialog.hxx @@ -110,7 +110,7 @@ class DebuggerDialog : public Dialog kDDSAdvCmd = 'DDsv', kDDRewindCmd = 'DDrw', kDDUnwindCmd = 'DDuw', - kDDExitCmd = 'DDex', + kDDRunCmd = 'DDex', kDDExitFatalCmd = 'DDer', kDDOptionsCmd = 'DDop' };