diff --git a/nb/ide.branding/licenseinfo.xml b/nb/ide.branding/licenseinfo.xml index c3a4f3aec0aa..2e70d3b49209 100644 --- a/nb/ide.branding/licenseinfo.xml +++ b/nb/ide.branding/licenseinfo.xml @@ -34,6 +34,7 @@ core.startup/src/org/netbeans/core/startup/frame48_dark_nb.gif core.startup/src/org/netbeans/core/startup/frame_nb.gif release/netbeans.icns + release/netbeans_mac.icns release/shortcuts.pdf release/shortcuts_mac.pdf diff --git a/nb/ide.branding/release/netbeans_mac.icns b/nb/ide.branding/release/netbeans_mac.icns new file mode 100644 index 000000000000..3d5d6b508ff0 Binary files /dev/null and b/nb/ide.branding/release/netbeans_mac.icns differ diff --git a/nb/ide.launcher/unix/netbeans b/nb/ide.launcher/unix/netbeans index 42c9808e5e08..fc7691a0ea18 100644 --- a/nb/ide.launcher/unix/netbeans +++ b/nb/ide.launcher/unix/netbeans @@ -154,7 +154,7 @@ case "`uname`" in eval launchNbexec \ --jdkhome '"$netbeans_jdkhome"' \ -J-Xdock:name=NetBeans \ - '"-J-Xdock:icon=$basedir/nb/netbeans.icns"' \ + '"-J-Xdock:icon=$basedir/nb/netbeans_mac.icns"' \ --branding nb \ --clusters '"$netbeans_clusters"' \ -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \ diff --git a/nbbuild/installer/components/products/nb-all/src/org/netbeans/installer/products/nb/all/ConfigurationLogic.java b/nbbuild/installer/components/products/nb-all/src/org/netbeans/installer/products/nb/all/ConfigurationLogic.java index d1691dbe2782..2bdcb576bd3a 100644 --- a/nbbuild/installer/components/products/nb-all/src/org/netbeans/installer/products/nb/all/ConfigurationLogic.java +++ b/nbbuild/installer/components/products/nb-all/src/org/netbeans/installer/products/nb/all/ConfigurationLogic.java @@ -907,7 +907,7 @@ public Map getAdditionalSystemIntegrationInfo() { public static final String ICON_UNIX = "/netbeans/" + NB_CLUSTER + "/netbeans.png"; // NOI18N public static final String ICON_MACOSX = - "/netbeans/" + NB_CLUSTER + "/netbeans.icns"; // NOI18N + "/netbeans/" + NB_CLUSTER + "/netbeans_mac.icns"; // NOI18N public static final String SHORTCUT_FILENAME = "Apache NetBeans-{display-version}.desktop"; // NOI18N diff --git a/nbbuild/installer/mac/newbuild/netBeans/nbide/build.xml b/nbbuild/installer/mac/newbuild/netBeans/nbide/build.xml index 6426d81a3d9f..e1baf1f343de 100644 --- a/nbbuild/installer/mac/newbuild/netBeans/nbide/build.xml +++ b/nbbuild/installer/mac/newbuild/netBeans/nbide/build.xml @@ -56,7 +56,7 @@ - + @@ -67,7 +67,7 @@ - +