Skip to content

Commit

Permalink
DeskTop: Enable File > Copy To... for volume icons
Browse files Browse the repository at this point in the history
Fixes #830
  • Loading branch information
inexorabletash committed Feb 19, 2025
1 parent 9dd5b0e commit 61b6173
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 17 deletions.
1 change: 1 addition & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Project Page: https://github.com/a2stuff/a2d
* Fix clipping bug when icon is underneath aligned right edges of two windows.
* Fix clipping bug when icon's middle is obscured by overlapping windows.
* Improve adding/editing shortcuts for volumes. ([#831](https://github.com/a2stuff/a2d/issues/831))
* Enable File > Copy To... for volume icons. ([#830](https://github.com/a2stuff/a2d/issues/830))

### Selector

Expand Down
2 changes: 1 addition & 1 deletion desktop/auxmem.s
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ file_menu:
kMenuItemIdRenameIcon = 7
kMenuItemIdDuplicate = 8
;; --------------------
kMenuItemIdCopyFile = 10
kMenuItemIdCopySelection = 10
kMenuItemIdDeleteFile = 11
;; --------------------
kMenuItemIdQuit = 13
Expand Down
2 changes: 1 addition & 1 deletion desktop/main.s
Original file line number Diff line number Diff line change
Expand Up @@ -1277,6 +1277,7 @@ disable:ldy #MGTK::disableitem_disable
table:
.byte kMenuIdFile, aux::kMenuItemIdOpen
.byte kMenuIdFile, aux::kMenuItemIdGetInfo
.byte kMenuIdFile, aux::kMenuItemIdCopySelection
.byte 0
.endproc ; _ToggleMenuItemsRequiringSelection
_EnableMenuItemsRequiringSelection := _ToggleMenuItemsRequiringSelection::enable
Expand Down Expand Up @@ -1313,7 +1314,6 @@ disable:ldy #MGTK::disableitem_disable

param_jump _ToggleMenuItems, table
table:
.byte kMenuIdFile, aux::kMenuItemIdCopyFile
.byte kMenuIdFile, aux::kMenuItemIdDeleteFile
.byte 0
.endproc ; _ToggleMenuItemsRequiringFileSelection
Expand Down
44 changes: 29 additions & 15 deletions res/notes/testplan.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,38 +120,52 @@
* Launch DeskTop. Clear the selection (e.g. by clicking on the DeskTop). Verify that:
* Special > Eject Disk and Special > Check Drive are disabled.
* File > Duplicate and Special > Make Alias are disabled.
* File > Rename is disabled.
* File > Open and File > Get Info are disabled.
* File > Rename and Edit > Cut/Copy/Paste/Clear are disabled.
* File > Delete is disabled.
* File > Open, File > Get Info, and File > Copy To... are disabled.
* File > Duplicate and Special > Make Alias are disabled.
* Launch DeskTop. Select only the Trash icon. Verify that:
* Special > Eject Disk and Special > Check Drive are disabled.
* File > Duplicate and Special > Make Alias are disabled.
* File > Rename is disabled.
* File > Open and File > Get Info are disabled.
* File > Rename and Edit > Cut/Copy/Paste/Clear are disabled.
* File > Delete is disabled.
* File > Open, File > Get Info, and File > Copy To... are disabled.
* File > Duplicate and Special > Make Alias are disabled.
* Launch DeskTop. Select a volume. Verify that:
* Special > Eject Disk and Special > Check Drive are enabled.
* File > Duplicate and Special > Make Alias are disabled.
* File > Rename is enabled.
* File > Open and File > Get Info are enabled.
* File > Rename and Edit > Cut/Copy/Paste/Clear are enabled.
* File > Delete is disabled.
* File > Open, File > Get Info, and File > Copy To... are enabled.
* File > Duplicate and Special > Make Alias are disabled.
* Launch DeskTop. Select two volume icons. Verify that:
* Special > Eject Disk and Special > Check Drive are enabled.
* File > Duplicate and Special > Make Alias are disabled.
* File > Rename is disabled.
* File > Open and File > Get Info are enabled.
* File > Rename and Edit > Cut/Copy/Paste/Clear are disabled.
* File > Delete is disabled.
* File > Open, File > Get Info, and File > Copy To... are enabled.
* File > Duplicate and Special > Make Alias are disabled.
* Launch DeskTop. Select a volume icon and the Trash icon. Verify that:
* Special > Eject Disk and Special > Check Drive are enabled.
* File > Duplicate and Special > Make Alias are disabled.
* File > Rename is disabled.
* File > Open and File > Get Info are enabled.
* Launch DeskTop. Open a volume window, and select a file. Verify that:
* File > Rename and Edit > Cut/Copy/Paste/Clear are disabled.
* File > Delete is disabled.
* File > Open, File > Get Info, and File > Copy To... are enabled.
* File > Duplicate and Special > Make Alias are disabled.
* Launch DeskTop. Open a volume window, and select a single file. Verify that:
* Special > Eject Disk and Special > Check Drive are disabled.
* File > Duplicate and Special > Make Alias are enabled.
* File > Rename is enabled.
* File > Open and File > Get Info are enabled.
* File > Rename and Edit > Cut/Copy/Paste/Clear are enabled.
* File > Delete is enabled.
* File > Open, File > Get Info, and File > Copy To... are enabled.
* File > Duplicate and Special > Make Alias are enabled.
* Launch DeskTop. Open a volume window, and select two files. Verify that:
* Special > Eject Disk and Special > Check Drive are disabled.
* File > Duplicate and Special > Make Alias are disabled.
* File > Rename is disabled.
* File > Open and File > Get Info are enabled.
* File > Rename and Edit > Cut/Copy/Paste/Clear are disabled.
* File > Delete is enabled.
* File > Open, File > Get Info, and File > Copy To... are enabled.
* File > Duplicate and Special > Make Alias are disabled.
* Launch DeskTop. Close all windows. Verify that File > New Folder, File > Close, File > Close All, and everything in the View menu are disabled.
* Launch DeskTop. Open a window. Verify that File > New Folder, File > Close, File > Close All, and everything in the View menu are enabled.
* Launch DeskTop. Open a window for a removable disk. Quit DeskTop. Remove the disk. Restart DeskTop. Open a different volume's window. Close it. Open it again. Verify that items in the File menu needing a window (New Folder, Close, etc) are correctly enabled.
Expand Down

0 comments on commit 61b6173

Please sign in to comment.