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.

Sign up for GitHub

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
Merged

Add higher resolution and scalable icons to IDE bundle #7755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion nb/ide.branding/licenseinfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<licenseinfo>
<fileset>
<file>autoupdate.services/libsrc/org/netbeans/updater/resources/updatersplash_nb.gif</file>
<file>release/netbeans.png</file>
<file>core.startup/src/org/netbeans/core/startup/splash_nb.gif</file>
<file>core.startup/src/org/netbeans/core/startup/frame_dark_nb.gif</file>
<file>core.startup/src/org/netbeans/core/startup/frame48_nb.gif</file>
Expand All @@ -33,6 +32,13 @@
<file>core.startup/src/org/netbeans/core/startup/about_dark_nb.png</file>
<file>core.startup/src/org/netbeans/core/startup/frame48_dark_nb.gif</file>
<file>core.startup/src/org/netbeans/core/startup/frame_nb.gif</file>
<file>release/apache-netbeans.ico</file>
<file>release/apache-netbeans.svg</file>
<file>release/apache-netbeans1024.png</file>
<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 •
edited
Loading

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 •
edited
Loading

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 •
edited
Loading

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.

Expand Down
Binary file added nb/ide.branding/release/apache-netbeans.ico
View file
Open in desktop
Binary file not shown.
71 changes: 71 additions & 0 deletions nb/ide.branding/release/apache-netbeans.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added nb/ide.branding/release/apache-netbeans1024.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added nb/ide.branding/release/apache-netbeans256.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added nb/ide.branding/release/apache-netbeans48.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added nb/ide.branding/release/apache-netbeans512.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading