Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring back custom icon option for Classic Mac OS #1626

Merged
merged 1 commit into from
Oct 14, 2024

Conversation

rdmark
Copy link
Member

@rdmark rdmark commented Oct 13, 2024

In addition to the ability to customize the icon, we bring back the logic that gives you a different default icon depending on whether the DSI or DDP transport layer is used.

String option `legacy icon' allows you to enable the custom icon by setting it to one of the below strings. Default value is a blank string, which will fall back to either the DSI or DDP icon.

The icon styles are brought back from the 2.x era icon.h. In the past the icon style was auto detected depending on your host OS, but now you are able to pick and choose. Available icon styles are:

  • daemon (previously the only option)
  • hagar
  • declogo
  • sunlogo
  • globe

@rdmark rdmark linked an issue Oct 13, 2024 that may be closed by this pull request
@rdmark rdmark force-pushed the 1622-bring-back-global-icon-option branch from 37f25d1 to d58751d Compare October 13, 2024 13:08
@rdmark rdmark marked this pull request as ready for review October 13, 2024 13:08
@rdmark rdmark changed the title Bring back custom icon option Bring back custom icon option for Classic Mac OS Oct 13, 2024
@rdmark rdmark force-pushed the 1622-bring-back-global-icon-option branch from d58751d to caaf6e5 Compare October 13, 2024 14:43
- In afp.conf, added string option `legacy icon' to set the style
- Available options are deamon, declogo, globe, hagar, sublogo
- This also reintroduces the DSI / DDP transport layer volume icons
@rdmark rdmark force-pushed the 1622-bring-back-global-icon-option branch from caaf6e5 to a75b0c2 Compare October 13, 2024 21:23
Copy link

sonarcloud bot commented Oct 13, 2024

@rdmark
Copy link
Member Author

rdmark commented Oct 14, 2024

@NJRoadfan When you have the opportunity, may I ask you to test the AppleTalk transport layer icon? I don't have any AppleTalk systems handy at the moment (in the middle of being shipped across the world.)

@rdmark rdmark merged commit 8a86ce2 into main Oct 14, 2024
15 checks passed
@rdmark rdmark deleted the 1622-bring-back-global-icon-option branch October 14, 2024 06:41
@NJRoadfan
Copy link
Contributor

It does work. Note that if AppleTalk is enabled, it always overrides the ASIP icon with the classic AppleTalk style no matter how you connect.

@rdmark
Copy link
Member Author

rdmark commented Oct 14, 2024

@NJRoadfan Thanks for testing. Good to know that nothing is broken, although it was not exactly what I wanted to achieve. Will make another attempt in the future when I have AppleTalk machines again to test with.

@NJRoadfan
Copy link
Contributor

No need for an actual machine. You can test it with asip-status -i

@rdmark
Copy link
Member Author

rdmark commented Oct 14, 2024

asip-status only makes TCP requests though, doesn't it? So I cannot test the DDP-only scenario this way.

@NJRoadfan
Copy link
Contributor

The FPGetSrvrInfo packet is the same for both transports. That might need to change in the future though as some older clients are choking if a FPGetSrvrInfo packet exceeds 512 bytes. This is mostly because of the added AFP versions and UAMs reported by Netatalk.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bring back Global icon option
2 participants