1
0
mirror of https://github.com/fadden/6502bench.git synced 2024-10-31 19:04:44 +00:00
Commit Graph

167 Commits

Author SHA1 Message Date
Andy McFadden
8f09cb2942 Rework Edit Status Flags layout
The Grid is a more natural fit.  Disabling M/X/E for 6502 is slightly
less convenient.
2019-06-22 13:09:49 -07:00
Andy McFadden
0041584d2e Rework NavStack
Instead of traversing a single dual-element stack, use separate
stacks for forward and backward.

Record whether the jump was from a Note, so we select the right
set of lines when we return to it.

If nothing is selected, push the current top position on, instead
of doing nothing at all.

Correctly handle the case where somebody is trying to jump to the
current position.
2019-06-22 11:36:08 -07:00
Andy McFadden
c87d79ec9e Wire up Open, Save, and Save As
These just needed to have methods added to the command definitions.

Also, added a style to the toolbar buttons so they fade when not
enabled.

Also, fixed the DataFileLoadIssue dialog, which was seriously broken.
2019-06-21 16:27:58 -07:00
Andy McFadden
440deda743 Tweak header letter position
This feels like Doing It Wrong, but some of the letters just don't
look centered over their radio buttons.  Nudge them a pixel.
2019-06-21 15:31:14 -07:00
Andy McFadden
34e6a2a086 Fiddle with failure report dialogs
I was setting the window size and letting the contents fill to fit.
Now I'm setting the content size and letting the window size itself
to fit around it.  The latter feels like it'll hold up better as
things change.
2019-06-21 15:23:13 -07:00
Andy McFadden
007bf4e934 Rename ProjWin directory to WpfGui
"ProjWin" didn't really mean anything.  "WpfGui" emphasizes that
the contents are a WPF implementation of the GUI elements.

No substantive changes.
2019-06-21 15:17:04 -07:00
Andy McFadden
fdf53bdb34 Add status flag editing
Getting the layout just right got a little wordy in XAML.  There's
probably a way to make a Grid do what I want.  This'll do for now.

Also, fixed the labels on the buttons in DiscardChanges, which were
reversed.
2019-06-21 15:06:04 -07:00
Andy McFadden
ea6125ea82 Save and restore grid column widths
Now preserving column widths for the three DataGrids and the main
ListView.  In theory the various grids would conveniently auto-size
to the content, but in practice that doesn't work well with
virtualization.

There is, of course, no simple "the width has changed" event
provided by the control.  On the plus side, you can attach a
property-change event handler to pretty much anything, so once you
know the trick it's possible to make everything work.  Yay WPF.
2019-06-20 15:10:35 -07:00
Andy McFadden
96a92f0335 Load/save app settings
This change pulls in the settings file code, which is mostly
unchanged except when it comes to saving and restoring the window
location and size.

The old system has been replaced with a PInvoke-based version that
calls the underlying Win32 window placement code.  This is more
likely to be correct when multiple displays are in use, and can
record the un-maximized size of a maximized window.  It leaves a
nasty XML string embedded in the config file, but it's not really
meant to be human-readable anyway.

The sub-window dividers all work completely differently from the way
they did in WinForms, and some of the behavior is a bit obscure
(like noticing when a splitter moves due to keyboard input, and
setting the position in a way that doesn't break the auto-sizing).
Yay WPF.

Still need to preserve column widths.
2019-06-19 18:09:55 -07:00
Andy McFadden
7339d2a681 Move symbol sort comparison function into Symbol class 2019-06-17 12:44:02 -07:00
Andy McFadden
f32135e2c7 Set Owner for all modal dialogs
This turns out to be really important.  Otherwise the modal dialog
doesn't stay on top of the application's window stack, which can
make things awkward when ShowInTaskbar is set to false.  The easiest
way to ensure this is getting done is to make it part of the
constructor arguments.

The code now passes the parent window in explicitly.  WPF MessageBox
avoids this by calling UnsafeNativeMethods.GetActiveWindow(), but
that feels weird.  We could assume Application.Current.MainWindow
is the parent, but that seems like it could go quietly and horribly
wrong.
2019-06-16 16:55:40 -07:00
Andy McFadden
61ecb28d60 Add Edit Address
Pretty simple dialog, but it took a while to figure out the best
way to deal with input validation.  Works from the various menus as
well as double-clicking on .ORG and address column entries.

Also, moved some stuff around to places that made more sense.
2019-06-16 16:40:08 -07:00
Andy McFadden
d3230ef0d6 Add addr/label target highlight
When you select a line that references a label within the file, we
highlight the address and label fields of the target offset.
2019-06-16 09:29:54 -07:00
Andy McFadden
1a0a229b9b Wire up sub-window double-click handlers and list nav
Wired up the double-click handlers for References, Notes, and
Symbols.  These jump to the item at the offset that was double-
clicked.  Also hooked up the navigate forward/backward buttons
in the toolbar.

Except for the usual WPF gymnastics required to figure out what you
actually double-clicked on, this went smoothly.
2019-06-15 16:00:31 -07:00
Andy McFadden
0abc7a7587 Populate Notes panel
This was pretty easy to do with DataGrid, even with custom background
colors in some cells.  Score one for WPF.
2019-06-12 15:54:22 -07:00
Andy McFadden
9e525d1428 Populate symbol table, with filtering and sorting
The filtering uses the DataGrid View filtering mechanism.  The
built-in sorting only operates on a single column, and we really
want a secondary sort on label when the type is used as the key,
so we provide a custom sort method.
2019-06-12 15:14:21 -07:00
Andy McFadden
b45382d294 Add double-click handler
Doesn't really do anything yet.  The hard part in WPF is figuring
out which row and column were clicked.
2019-06-11 18:45:08 -07:00
Andy McFadden
1a9f99098a Wire up undo, redo, and F1 help
Also, fixed some crashiness in the can-execute tests for hints.
If you crash an a can-execute method you get a really unhelpful
failure message.  Asserts don't work there either.  Yay WPF.
2019-06-11 16:27:15 -07:00
Andy McFadden
41b6a97408 Populate toolbar icons
Extract some XAML icons from the VS2017 Image Library.  There's no
particular reason to prefer XAML over PNG, but somehow it feels
more forward-compatible.  (OTOH, defining images as ControlTemplate
instances is just weird.  Yay WPF.)
2019-06-11 14:38:08 -07:00
Andy McFadden
9c8afab2ea Restore selection and top position after change
Restoring the selection works pretty much like it used to, though
I'm capping the total size of the selection because it goes into
stupid-slow mode if you have too many elements.

Getting the item that is at the top of the ListView is astoundingly
obscure, due to the ListView's extreme generality.  I make a
simplifying assumption -- that we're using a VSP -- which allows us
to use a simple vertical offset once we've dug the appropriate
object out of the visual tree.  (The alternative is to walk through
the list of items and see what's on screen, or perform a hit test
calculation in the upper left corner.)  Yay WPF.
2019-06-10 15:46:35 -07:00
Andy McFadden
0c682e9cff Wire up References panel
Output to DataGrid is working.  Don't yet handle double-clicks or
preserve column widths.
2019-06-09 18:09:00 -07:00
Andy McFadden
814ab97c4d Wire up the Info panel 2019-06-09 14:24:46 -07:00
Andy McFadden
fa386a0d03 Finish wiring up code hint commands 2019-06-08 17:13:11 -07:00
Andy McFadden
80ec6b6c78 Add selection analysis
The various items in the Actions menu are enabled or disabled based
on the current selection.  There's no SelectedIndices property in
WPF ListViews, so we have to do things slightly differently.

The SelectedItems list isn't kept sorted to match the list contents,
so finding first/last item requires a bit of scanning.

Also, rearranged some stuff.  I'm trying to keep the old and new
code somewhat parallel, to make it easier to walk through at the end
and see if I've missed something.
2019-06-08 16:13:04 -07:00
Andy McFadden
558f1e4350 Wire up selection tracking
Renamed VirtualListViewSelection to DisplayListSelection, because
it's now tied to the DisplayList implementation.  Hooked it up to
handle SelectionChanged events.

Also, tweaked the code list item style to remove the one-pixel gap
between items.  Somehow I manage to click on the dead zone with
surprising regularity.
2019-06-07 17:25:04 -07:00
Andy McFadden
fdbd5b89e9 More menu stuff
Create context menu as a clone of the Actions menu.  This is a bit
easier than it was in WinForms because the ICommand stuff provides
common routing and enable/disable logic for all instances.  (It's
one of the few places where WPF has made my life easier.  Yay WPF.)

Added CanExecute tests to existing items.  Currently they just
check to see if the project is open.

Wired up File > Close.
2019-06-07 14:03:34 -07:00
Andy McFadden
0f7e0e8d21 Fix multi-multi-key inputs
When we match a multi-key sequence, send an event to all other
multi-key handlers to tell them to reset.
2019-06-07 13:10:52 -07:00
Andy McFadden
499d3478ba Add multi-key combo handling for hints
Doesn't work 100% correctly -- in some cases, using two different
combos in quick succession will fail -- but it's close.

Added stub methods for the four hint operations.
2019-06-04 16:10:55 -07:00
Andy McFadden
9bbaa80570 Fix setting of IsLongComment 2019-06-04 13:06:38 -07:00
Andy McFadden
da825d3114 Make ResetList() 1000x faster
Rather than sending 540,000 "item has changed" events, send a
single "collection reset" message.
2019-05-30 16:30:59 -07:00
Andy McFadden
a7d66e67e0 Fiddle with selection
There was a bigger change here, but the approach turned out to
have some problems with large sets.  The current app saves and
restores the selected rows when you make an edit, retaining the set
of selected bytes even if the number of lines changes (maybe you
reformatted bytes into a string).  There's no way to do that quickly
with WPF when the number of selected items gets large (say 10K+).
I will probably just cap the selection, and refuse to restore it if
it exceeds a certain size.

The ListView SelectedItems management seems to use an O(n^2) (or
worse) algorithm.  It might be trying to verify that items being
added to SelectedItems actually exist in Items -- I can see it
calling Contains().  Whatever the case, it's a big step backward
performance-wise from WinForms.  Yay WPF.

See the DisasmUiTest project's Selection Test to see what I tried.
2019-05-29 17:39:36 -07:00
Andy McFadden
17af7efbbb Show formatted data in the code list
The disassembled lines are now shown in the custom-styled list view.
The DisplayList isn't being kept up to date on edits, but since we
can't edit anything yet that's not too limiting.

Pulled more code over, including the mostly-GUI-agnostic bits of the
source generation and assembler execution code.
2019-05-27 18:52:25 -07:00
Andy McFadden
c4a056bd0a Merge ListView style from DisasmUiTest project
Long comments and notes now occupy the correct columns.
2019-05-23 13:38:41 -07:00
Andy McFadden
7bed043869 Tweak code list view
Still not right, but it's at least you can tell which lines are
selected now.

I never thought I'd miss owner-drawn ListViews.  I was mistaken.
Yay WPF.
2019-05-12 16:27:28 -07:00
Andy McFadden
bca1585571 Experiment with a ListView style
I'm trying to make the ListView look like the old owner-drawn
WinForms UI.  The tricky bit is getting long comments and notes to
start in column 5 (label) and extend across multiple columns.

This approach sort of works, though it's currently incomplete, e.g.
the selection highlight style apparently gets dropped.
2019-05-12 14:30:10 -07:00
Andy McFadden
f3f4c44633 Refactor DisplayList to support data virtualization
In WinForms, if you want a virtual ListView, you set the "virtual"
property and define a couple of callbacks.  In WPF, there are
separate notions of "UI virtualization" and "data virtualization".
The former is done automatically (usually) by the ListView.  The
latter requires creating an implementation of IList, and relies on
behavior that I'm having trouble finding in official documentation.
Yay WPF.

This splits the source-generation stuff out into DisplayListGen,
leaving DisplayList as a list of stuff to display that can be bound
to WPF as a ListView ItemsSource.  The DisplayList instance will have
a hook back into DisplayListGen to perform the on-demand string
rendering.  (For now it's just generating test patterns.)
2019-05-11 10:16:54 -07:00
Andy McFadden
d830605f5e Add a place-holder code ListView
Set up a notifiable property to control whether the "launch panel"
(i.e. the thing you see when the app launches) or the code ListView
is visible.  Unearthed the magic required to left-justify the column
headers.
2019-05-09 16:13:20 -07:00
Andy McFadden
bf310d17bc Load a hard-coded project file
Fixed some stuff that crashed.  The project is loaded but nothing
visually interesting happens yet.

I'm still not entirely sure what the deal with declaring resources
is, but it seems you can either declare a ResourceDictionary and put
everything in it, or you can declare a bunch of items, which are then
implicitly placed in a ResourceDictionary.  This matters if you want
to have your string definitions merged in with everything else.  All
of the examples I found did one thing or the other, not both at once,
so it took some fiddling.  Yay WPF.
2019-05-08 18:08:46 -07:00
Andy McFadden
ce27ae720e Port project loader code
Created a file to hold the non-WPF parts of ProjectView.cs.
Pulled some code related to project loading into it.  Created a few
related dialogs.
2019-05-05 16:50:28 -07:00
Andy McFadden
c976b92f34 Show app version
Done with full WPF fanciness, including XAML string formatting and
property extraction, with a fallback value so I can see what it looks
like in the designer.

It took about half an hour to figure this out.  Yay WPF.
2019-05-03 15:43:16 -07:00
Andy McFadden
575f834b1d Copy some non-UI code over
Mostly a straight copy & paste of the files.  The only significant
change was to move the localizable strings from Properties/Resources
(RESX) to Res/Strings.xaml (Resource Dictionary).  I expect a
number of strings will no longer be needed, since WPF lets you put
more of the UI/UX logic into the design side.

I also renamed the namespace to SourceGenWPF, and put the app icon
into the Res directory so it can be a resource rather than a loose
file.  I'm merging the "Setup" directory contents into the main app
since there wasn't a whole lot going on there.

The WPF Color class lacks conversions to/from a 32-bit integer, so
I added those.

None of the stuff is wired up yet.
2019-05-02 15:45:40 -07:00
Andy McFadden
8ceae370cc Add WPF app skeleton
Just some XAML for the main work area.
2019-04-29 16:34:09 -07:00
Andy McFadden
823aa072fb Update comments 2019-04-29 13:07:52 -07:00
Andy McFadden
ab590c5a2a Version 1.1.0 2019-04-19 14:54:10 -07:00
Andy McFadden
6185b85f7b Fix crash on asm gen when no settings file exists 2019-04-19 14:43:33 -07:00
Andy McFadden
6998eb4021 Minor doc edits
Added Ctrl+W to the tutorial.  Named the 64tass executable.
Performed various acts of word-smithing.
2019-04-19 14:10:48 -07:00
Andy McFadden
8d0ce87ec7 Experiment on uncategorized data analysis
Tried something to speed it up.  Didn't help.  Cleaned up the code
a bit though.
2019-04-18 15:58:43 -07:00
Andy McFadden
61d6cd597a Document the auto-label style setting 2019-04-15 16:04:11 -07:00
Andy McFadden
ba44774810 Version 1.1.0-dev3 2019-04-15 15:35:49 -07:00
Andy McFadden
97a372a884 Add selectable auto-label styles
SourceGen creates "auto" labels when it finds a reference to an
address that doesn't have a label associated with it.  The label for
address $1234 would be "L1234".  This change allows the project to
specify alternative label naming conventions, annotating them with
information from the cross-reference data.  For example, a subroutine
entry point (i.e. the target of a JSR) would be "S_1234".  (The
underscore was added to avoid confusion when an annotation letter
is the same as a hex digit.)

Also, tweaked the way the preferred clipboard line format is stored
in the settings file (was an integer, now an enumeration string).
2019-04-15 15:14:04 -07:00