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

Add higher resolution and scalable icons to IDE bundle #7755

Merged
merged 1 commit into from
Sep 23, 2024

Conversation

neilcsmith-net
Copy link
Member

Copy of SVG and ICO files from NBPackage.

Copy and rename PNG files from platform/core.startup/src/org/netbeans/core/startup

The SVG is used as the icon for the ASF and community Linux installers, so has been pretty well tested in various desktop environments. It has no license header as this has been proven to fail to display in certain places (eg. parts of GNOME). Added to RAT exclusions with a note.

Fixes #4881 and #7734

@neilcsmith-net neilcsmith-net added UI User Interface ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) labels Sep 16, 2024
@neilcsmith-net neilcsmith-net added this to the NB24 milestone Sep 16, 2024
Copy link
Contributor

@matthiasblaesing matthiasblaesing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rat exclusion is not necessary. Apart from that this looks sane to me. Thank you!

Comment on lines 178 to 179
### license breaks display in some usages
nb/ide.branding/release/apache-netbeans.svg
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not necessary. There is an entry for release/apache-netbeans.svg in the licenseinfo.xml file and that in turn removes it from the rat auditing.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I didn't realise it did that. I checked with ant rat before adding it in the license info. Will remove from this file then.

Copy SVG and ICO files from NBPackage.
Copy and rename PNG files from platform/core.startup/src/org/netbeans/core/startup
Copy link
Contributor

@matthiasblaesing matthiasblaesing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

Copy link
Member

@mbien mbien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome!

<file>release/apache-netbeans256.png</file>
<file>release/apache-netbeans48.png</file>
<file>release/apache-netbeans512.png</file>
<file>release/netbeans.png</file>
<file>release/netbeans.icns</file>
<file>release/shortcuts.pdf</file>
<file>release/shortcuts_mac.pdf</file>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

the reason netbeans.png and netbeans.icns were not renamed to apache-netbeans.png and apache-netbeans_mac.icns is to avoid problems with paths downstream?

If yes: we should still consider renaming just the mac variant since it was only there for two releases and it is not like the others style wise.

Copy link
Member Author

@neilcsmith-net neilcsmith-net Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I chose to use the name apache-netbeans to be clear about the official icons, and left the two legacy paths the same, in case of external use.

And -1 to changing the semantics of the mac variant path. This has always been the path to the macOS dock icon, and added to set -Xdock:icon in the launcher script. It should remain as such. This path is certainly not two releases old! If anyone really wants another .icns file, they can add it as apache-netbeans.icns after this.

https://github.com/apache/netbeans/blob/master/nb/ide.launcher/unix/netbeans#L157

Copy link
Member

@mbien mbien Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes the mac-os theme specific logo is 2 releases old, not the path itself which used to be the standard netbeans logo in the icns format.

netbeans_21/nb:
image

I was just wondering why can't this be kept as in NB 21 and the mac-os theme specific icon would be added as apache-netbeans_mac.icns? (_mac since the shortcuts pdf already uses the postfix)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case any macOS packaging (macports, homebrew, etc) still references the legacy path to get the macOS dock icon. Whatever is at that path should continue to match the dock icon.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case any macOS packaging (macports, homebrew, etc) still references the legacy path to get the macOS dock icon.

and flatpak, gnome start menus etc (#7734), since NB 22 when the change happened

i guess we could file issues against the downstream packages - but i keep wondering if simply reverting the file which was only mac specific for NB 22 and 23 and adding a dedicated mac file which is named accordingly for NB 24+ would be the easiest solution.

Copy link
Member Author

@neilcsmith-net neilcsmith-net Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That path has always been mac specific from NetBeans' perspective, so yes we can provide a suitable svg/png replacement and then report issues in non-mac packages if we need to.

EDIT : have added an issue report on the flatpak package.

@neilcsmith-net neilcsmith-net merged commit ac9e96b into apache:master Sep 23, 2024
31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) UI User Interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

No high resolution icon (png)
3 participants