From bbb117348584107d4fe0fe36fac7948693442643 Mon Sep 17 00:00:00 2001
From: Kirill Vainer <shadowislord@gmail.com>
Date: Tue, 11 Aug 2015 21:19:58 -0400
Subject: [PATCH] linux SDK shortcut: proper category & description for
 .desktop file

---
 sdk/build.xml                                                | 2 ++
 .../products/helloworld/src/org/mycompany/Bundle.properties  | 5 +++--
 .../helloworld/src/org/mycompany/ConfigurationLogic.java     | 5 ++---
 sdk/nbi/stub/template.xml                                    | 4 +++-
 sdk/nbproject/project.properties                             | 2 ++
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sdk/build.xml b/sdk/build.xml
index 495057178..b843d779a 100644
--- a/sdk/build.xml
+++ b/sdk/build.xml
@@ -221,6 +221,8 @@
             <property name="pack200.enabled" value="true"/>
             <property name="nbi.icon.file" value="${basedir}/jmonkeyplatform.png"/>
             <property name="nbi.dock.icon.file" value="${basedir}/jmonkeyplatform.icns"/>
+            <property name="product.description" value="${app.description}"/>
+            <property name="product.categories" value="${app.categories}"/>
         </ant>
     </target>
 
diff --git a/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/Bundle.properties b/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/Bundle.properties
index 273df84b3..956a1f2e6 100644
--- a/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/Bundle.properties
+++ b/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/Bundle.properties
@@ -1,6 +1,7 @@
 CL.app.name={product-simple-name}
+CL.app.categories={product-categories}
 CL.desktop.shortcut.name={product-name}
-CL.desktop.shortcut.description=
+CL.desktop.shortcut.description={product-description}
 CL.desktop.shortcut.path=
 CL.unix.icon.name={product-icon-name}
 CL.unix.icon.resource=org/mycompany/{product-icon-name}
@@ -8,7 +9,7 @@ CL.unix.icon.resource=org/mycompany/{product-icon-name}
 
 CL.start.menu.shortcut.name={product-name}
 CL.start.menu.shortcut.name.macosx={product-name}
-CL.start.menu.shortcut.description=
+CL.start.menu.shortcut.description={product-description}
 CL.start.menu.shortcut.path=
 
 CL.install.desktop=Creating shortcut on desktop
diff --git a/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java b/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java
index 6d4c7e811..1b6e709a0 100644
--- a/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java
+++ b/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java
@@ -464,9 +464,8 @@ public class ConfigurationLogic extends ProductConfigurationLogic {
     }
     public static final String SHORTCUT_FILENAME =
             ResourceUtils.getString(ConfigurationLogic.class, "CL.app.name") + ".desktop"; // NOI18N
-    public static final String[] SHORTCUT_CATEGORIES = new String[]{
-        "Application"
-    };
+    public static final String[] SHORTCUT_CATEGORIES = 
+            ResourceUtils.getString(ConfigurationLogic.class, "CL.app.categories").split(","); // NOI18N
     public static final String BIN_SUBDIR =
             "bin/";
     public static final String EXECUTABLE_WINDOWS =
diff --git a/sdk/nbi/stub/template.xml b/sdk/nbi/stub/template.xml
index 80184f717..be69f1883 100644
--- a/sdk/nbi/stub/template.xml
+++ b/sdk/nbi/stub/template.xml
@@ -124,9 +124,11 @@
         <replace dir="${installer.build.dir}/ext" encoding="utf-8">
             <replacefilter token="{product-name}" value="${suite.props.app.title}"/>
             <replacefilter token="{product-simple-name}" value="${suite.props.app.name}"/>
-            <replacefilter token="{product-description}" value=""/>
             <replacefilter token="{product-uid}"         value="${product.uid}"/>
             <replacefilter token="{product-icon-name}"   value="${icon.name}"/>
+            <!--kirill-->
+            <replacefilter token="{product-description}" value="${product.description}"/>
+            <replacefilter token="{product-categories}"  value="${product.categories}" />
         </replace>
 
         <replace dir="${installer.build.dir}/ext/infra/build/products" encoding="utf-8">
diff --git a/sdk/nbproject/project.properties b/sdk/nbproject/project.properties
index dbcdb7343..d7206b308 100644
--- a/sdk/nbproject/project.properties
+++ b/sdk/nbproject/project.properties
@@ -3,6 +3,8 @@ app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
 #same as ${branding.token}
 app.name=jmonkeyplatform
 app.title=jMonkeyEngine SDK
+app.description=A complete 3D game development suite written purely in Java.
+app.categories=Development,Graphics,IDE,3DGraphics,Java
 app.icon.icns=jmonkeyplatform.icns
 #version name used for application and settings folder, no spaces!
 app.version=3.1-snapshot-github