Added windows icons

winder · Nov 6, 2023 · 15d844a · 15d844a
1 parent c9c23b8
commit 15d844a
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 7 deletions.
diff --git a/ugs-platform/application/pom.xml b/ugs-platform/application/pom.xml
@@ -308,6 +308,10 @@
                                         <property name="bundle.jvm.path" refid="jre_name" />
                                         <basename property="bundle.jvm.name" file="${bundle.jvm.path}"/>
 
+                                        <!-- Delete windows binaries -->
+                                        <delete file="${project.build.directory}/${brandingToken}-win/bin/ugsplatform64.exe" failonerror="false"/>
+                                        <delete file="${project.build.directory}/${brandingToken}-win/bin/ugsplatform" failonerror="false"/>
+
                                         <!-- Configure relative JRE path into ugsplatform.conf -->
                                         <replace file="${project.build.directory}/${brandingToken}-win/etc/${brandingToken}.conf" token="#jdkhome=&quot;/path/to/jdk&quot;" value="jdkhome=&quot;jdk/${bundle.jvm.name}&quot;"/>
 
@@ -385,6 +389,10 @@
                                         <property name="bundle.jvm.path" refid="jre_name" />
                                         <basename property="bundle.jvm.name" file="${bundle.jvm.path}"/>
 
+                                        <!-- Delete windows binaries -->
+                                        <delete file="${project.build.directory}/${brandingToken}-win/bin/ugsplatform.exe" failonerror="false"/>
+                                        <delete file="${project.build.directory}/${brandingToken}-win/bin/ugsplatform" failonerror="false"/>
+
                                         <!-- Configure relative JRE path into ugsplatform.conf -->
                                         <replace file="${project.build.directory}/${brandingToken}-win/etc/${brandingToken}.conf" token="#jdkhome=&quot;/path/to/jdk&quot;" value="jdkhome=&quot;jdk/${bundle.jvm.name}&quot;"/>
 

diff --git a/ugs-platform/application/src/main/app-resources/icon.ico b/ugs-platform/application/src/main/app-resources/icon.ico
diff --git a/...randing/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif b/...randing/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif
diff --git a/...randing/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.png b/...randing/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.png
diff --git a/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.gif b/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.gif
diff --git a/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.png b/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.png
diff --git a/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.gif b/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.gif
diff --git a/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.png b/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.png
diff --git a/...tform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/CreateShortcutAction.java b/...tform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/CreateShortcutAction.java
@@ -72,15 +72,19 @@ public void actionPerformed(ActionEvent e) {
 
     private static void createWindowsShortcut() {
         try {
-            String shortcutPath = System.getProperty("user.home") + File.separator + "Desktop";
+            String shortcutPath = System.getProperty("user.home") + File.separator + "Desktop" + File.separator + "Universal Gcode Sender.lnk";
             Path currentRelativePath = Paths.get("");
-            String ugsDirectory = currentRelativePath.toAbsolutePath().toString();
 
-            ShellLink.createLink("c:\\" + ugsDirectory + File.separator + "ugsplatform.bat")
-                    .setWorkingDir(ugsDirectory)
-                    .setIconLocation(ugsDirectory + File.separator + "icon.ico")
-                    .setTarget(shortcutPath)
-                    .saveTo("Universal Gcode Sender.lnk");
+            String basePath = currentRelativePath.toAbsolutePath() + File.separator + "bin" + File.separator;
+            String executablePath = basePath + "ugsplatform64.exe";
+            if (!new File(executablePath).exists()) {
+                executablePath = basePath + "ugsplatform.exe";
+            }
+
+            ShellLink.createLink(executablePath)
+                    .setWorkingDir(currentRelativePath.toAbsolutePath().toString())
+                    .setIconLocation(basePath + "icon.ico")
+                    .saveTo(shortcutPath);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }