Add NetBeans icon to match macOS 11 look and feel

apache · Sep 21, 2021 · 402261b · 402261b
1 parent e5f2f7c
commit 402261b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/nb/ide.branding/licenseinfo.xml b/nb/ide.branding/licenseinfo.xml
@@ -34,6 +34,7 @@
         <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/netbeans.icns</file>
+        <file>release/netbeans_mac.icns</file>
         <file>release/shortcuts.pdf</file>
         <file>release/shortcuts_mac.pdf</file>
         <license ref="Apache-2.0-ASF" />

diff --git a/nb/ide.branding/release/netbeans_mac.icns b/nb/ide.branding/release/netbeans_mac.icns
diff --git 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/...onents/products/nb-all/src/org/netbeans/installer/products/nb/all/ConfigurationLogic.java b/...onents/products/nb-all/src/org/netbeans/installer/products/nb/all/ConfigurationLogic.java
@@ -907,7 +907,7 @@ public Map<String, Object> 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
@@ -56,7 +56,7 @@
                 <filter token="APPVERSION" value="${appversion}"/>
                 <filter token="VERSION" value="${nbide.version}"/>
                 <filter token="EXENAME" value="netbeans"/>
-                <filter token="ICONFILENAME" value="netbeans.icns"/>
+                <filter token="ICONFILENAME" value="netbeans_mac.icns"/>
                 <filter token="NB_ID" value="${nb.id}"/>
             </filterset>
         </copy>
@@ -67,7 +67,7 @@
         </delete>
 
         <echo message="Copying the icon into the correct place" />
-        <copy file="${appdir}/Contents/Resources/NetBeans/netbeans/${nbClusterDir}/netbeans.icns" todir="${appdir}/Contents/Resources"/>
+        <copy file="${appdir}/Contents/Resources/NetBeans/netbeans/${nbClusterDir}/netbeans_mac.icns" todir="${appdir}/Contents/Resources"/>
 
         <echo message="Creating native macOS NetBeans launcher ${appdir}/Contents/MacOS/netbeans"/>
         <exec executable="swift" failonerror="yes" dir="../../../../../../nb/ide.launcher/macosx">