From 3cc6f32c6f3fe857d4a40061ad1148749a46f30f Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Sat, 19 Oct 2019 17:46:40 -0700 Subject: [PATCH] Put some stuff in a "Navigate" menu Created a Navigate menu, and put the menu items for Find and Go To in it. Added menu items for nav-forward and nav-backward, which until now were only available as toolbar buttons. --- SourceGen/RuntimeData/Help/mainwin.html | 11 ++++++----- SourceGen/RuntimeData/Help/tutorials.html | 10 +++++----- SourceGen/WpfGui/MainWindow.xaml | 14 +++++++++----- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/SourceGen/RuntimeData/Help/mainwin.html b/SourceGen/RuntimeData/Help/mainwin.html index 0ab159f..5ee8269 100644 --- a/SourceGen/RuntimeData/Help/mainwin.html +++ b/SourceGen/RuntimeData/Help/mainwin.html @@ -327,14 +327,14 @@ especially handy for undocumented instructions.

on your mouse, or by left-clicking and dragging the scroll bar. You can also use PgUp/PgDn and the arrow keys.

-

Use Edit > Find to search for text. This performs a case-insensitive +

Use Navigate > Find to search for text. This performs a case-insensitive text search on the label, opcode, operand, and comment fields. -Use Edit > Find Next to find the next match, and -Edit > Find Previous to find the previous match. Note "next" is +Use Navigate > Find Next to find the next match, and +Navigate > Find Previous to find the previous match. Note "next" is always downward, and "previous" is always upward, regardless of the direction of the initial search chosen in the Find dialog.

-

Use Edit > Go To to jump to an offset, address, or label. Remember +

Use Navigate > Go To to jump to an offset, address, or label. Remember that offsets and addresses are always hexadecimal, and offsets start with a '+'. If you have a label that is also a valid hexadecimal address, like "FEED", the label takes precedence. To jump to the address @@ -343,7 +343,8 @@ write "$FEED" instead.

When you jump around, by double-clicking on an opcode or an entry in one of the side windows, the currently-selected line is added to a navigation stack. You can use the arrows on the toolbar to navigate -forward or backward. (You can use Alt+Left/Right Arrow, or +forward or backward, or Navigate > Nav Forward and +Navigate > Nav Backward. (You can use Alt+Left/Right Arrow, or Ctrl+- / Ctrl+Shift+-, as keyboard shortcuts.)

diff --git a/SourceGen/RuntimeData/Help/tutorials.html b/SourceGen/RuntimeData/Help/tutorials.html index ad3b608..f6a8aef 100644 --- a/SourceGen/RuntimeData/Help/tutorials.html +++ b/SourceGen/RuntimeData/Help/tutorials.html @@ -106,12 +106,12 @@ row of buttons. Make sure "Auto" and "Addr" are selected. You should see three labels in the window (L1002, L1014, L1017). Double-click on L1014. The selection jumps to the appropriate line.

-

Select Edit > Find. Type "hello", and hit Enter. The selection will +

Select Navigate > Find. Type "hello", and hit Enter. The selection will move to address $100E, which is a string that says "hello!". You can use -Edit > Find Next to try to find the next occurrence (there isn't one). You +Navigate > Find Next to try to find the next occurrence (there isn't one). You can search for any text that appears in the rightmost columns (label, opcode, operand, comment).

-

Select Edit > Go To. You can enter a label, address, or file offset. +

Select Navigate > Go To. You can enter a label, address, or file offset. Enter "100b" to set the selection to $100B.

Near the top-left of the SourceGen window is a set of toolbar icons. @@ -174,7 +174,7 @@ to $2000, then jumping to $2000. It appears to be relocating the next part of the code before executing it. We want to let the disassembler know what's going on, so select the line at address $1017 and then -Edit > Set Address. (Or double-click the "1017" in the Addr column.) +Actions > Set Address. (Or double-click the "1017" in the Addr column.) In the Set Address dialog, type "2000", and hit Enter.)

Note the way the code list has changed. When you changed the address, @@ -363,7 +363,7 @@ that looks for strings and .FILL regions, so now each uncategorized byte is on its own line.

You could select the first two lines and use Actions > Edit Operand to format them as a 16-bit little-endian hex value, but there's a shortcut: -select only the first line of code, then Edit > Format As Word (Ctrl+W). It +select only the first line of code, then Actions > Format As Word (Ctrl+W). It automatically grabbed the following byte and combined them. Since we believe $2000 is the load address for everything that follows, click on the line with address $1002, select Actions > Set Address, and enter "2000". With diff --git a/SourceGen/WpfGui/MainWindow.xaml b/SourceGen/WpfGui/MainWindow.xaml index 8c44cb0..3a50afd 100644 --- a/SourceGen/WpfGui/MainWindow.xaml +++ b/SourceGen/WpfGui/MainWindow.xaml @@ -321,12 +321,7 @@ limitations under the License. - - - - - @@ -336,6 +331,15 @@ limitations under the License. + + + + + + + + +