Make Apple-Delete shortcut for deleting file. Fixes #150

This commit is contained in:
Joshua Bell 2019-04-14 19:38:47 -06:00
parent 91d91d14c8
commit 1e162f3564
3 changed files with 18 additions and 4 deletions

View File

@ -23,6 +23,7 @@ https://github.com/inexorabletash/a2d/issues
* GS/OS filenames (supported by ProDOS 2.5) are shown with correct case. (#64) * GS/OS filenames (supported by ProDOS 2.5) are shown with correct case. (#64)
* Tip about skipping copy to RAMCard is shown during startup. (#140) * Tip about skipping copy to RAMCard is shown during startup. (#140)
* Apple-` or Apple-Tab keypress cycles through open windows. (#143) * Apple-` or Apple-Tab keypress cycles through open windows. (#143)
* Apple-Delete deletes selected files. (#150)
### Desk Accessory Enhancements ### Desk Accessory Enhancements
@ -44,7 +45,7 @@ https://github.com/inexorabletash/a2d/issues
* Eyes * Eyes
* Eyes that follow the mouse. (#53) * Eyes that follow the mouse. (#53)
* Screen Saver * Screen Saver
* Homage to Jack Eastman's classic. More to come. (#27) * Homage to the classic After Dark "Flying Toasters" by Jack Eastman. More to come. (#27)
Note that several of the new Desk Accessories will not work with older versions Note that several of the new Desk Accessories will not work with older versions
of Apple II DeskTop/MouseDesk, due to dependence on new APIs. of Apple II DeskTop/MouseDesk, due to dependence on new APIs.

View File

@ -464,6 +464,9 @@ handle_keydown:
: cmp #'X' ; OA-X (Scroll) : cmp #'X' ; OA-X (Scroll)
bne :+ bne :+
jmp cmd_scroll jmp cmd_scroll
: cmp #CHAR_DELETE ; OA-Delete (Delete)
bne :+
jmp cmd_delete_selection
: cmp #'`' ; OA-` (Cycle Windows) : cmp #'`' ; OA-` (Cycle Windows)
beq cycle beq cycle
cmp #CHAR_TAB ; OA-Tab (Cycle Windows) cmp #CHAR_TAB ; OA-Tab (Cycle Windows)
@ -2514,6 +2517,13 @@ done: jmp redraw_windows_and_desktop
;;; ============================================================ ;;; ============================================================
.proc cmd_delete_selection
copy trash_icon_num, drag_drop_param
jmp process_drop
.endproc
;;; ============================================================
.proc cmd_rename_icon .proc cmd_rename_icon
jsr jt_rename_icon jsr jt_rename_icon
pha pha
@ -3806,6 +3816,7 @@ start_icon_drag:
lda drag_drop_param lda drag_drop_param
beq desktop beq desktop
process_drop:
jsr jt_drop jsr jt_drop
;; Failed? ;; Failed?
@ -3960,6 +3971,7 @@ L5E77: .byte 0
.endproc .endproc
handle_file_icon_click := handle_file_icon_click_impl::start handle_file_icon_click := handle_file_icon_click_impl::start
swap_in_desktop_icon_table := handle_file_icon_click_impl::swap_in_desktop_icon_table swap_in_desktop_icon_table := handle_file_icon_click_impl::swap_in_desktop_icon_table
process_drop := handle_file_icon_click_impl::process_drop
;;; ============================================================ ;;; ============================================================

View File

@ -13,12 +13,13 @@ with the keyboard.
* △-G - Resize window; Arrows to resize, Return to finish * △-G - Resize window; Arrows to resize, Return to finish
* △-M - Move window; Arrows to move, Return to finish * △-M - Move window; Arrows to move, Return to finish
* △-X - Scroll contents; Arrows to scroll, Esc or Return when done * △-X - Scroll contents; Arrows to scroll, Esc or Return when done
* △-` or △-X - Cycle through open windows * △-` or △-Tab - Cycle through open windows
## Icons ## Icons
* △-H - Highlight icon; Left/Right Arrows to navigate, Esc or Return when done * △-H - Highlight icon; Left/Right Arrows to navigate, Esc or Return when done
* △-A - Select all icons * △-A - Select all icons
* △-Delete - Delete selected icons (or eject volume)
## Menus ## Menus
@ -34,7 +35,7 @@ __File Menu__
* △-A - Select All * △-A - Select All
* △-Y - Copy a File * △-Y - Copy a File
* △-D - Delete a File * △-D - Delete a File
* △-E - Eject * △-I - Get Info
* △-Q - Quit * △-Q - Quit
__View Menu__ __View Menu__
@ -45,9 +46,9 @@ __View Menu__
* △-L - View By Type * △-L - View By Type
__Special Menu__ __Special Menu__
* △-E - Eject Disk
* △-S - Format a Disk * △-S - Format a Disk
* △-Z - Erase a Disk * △-Z - Erase a Disk
* △-I - Get Info
__Selector Menu__ __Selector Menu__
* △-0 - Run Selector * △-0 - Run Selector