From 88189bc12313a7d503bc88f8f098e637591020c6 Mon Sep 17 00:00:00 2001 From: kske Date: Mon, 17 Jan 2022 10:36:58 +0100 Subject: [PATCH 1/2] Categories for Linux desktop entry Added a main category and multiple additional categories to the desktop entry template. --- app/assets/linux/SceneBuilder.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/linux/SceneBuilder.desktop b/app/assets/linux/SceneBuilder.desktop index 87e1ab5c5..e5cd0f87d 100644 --- a/app/assets/linux/SceneBuilder.desktop +++ b/app/assets/linux/SceneBuilder.desktop @@ -5,6 +5,6 @@ Exec=APPLICATION_LAUNCHER Icon=APPLICATION_ICON Terminal=false Type=Application -Categories=DEPLOY_BUNDLE_CATEGORY +Categories=Development;Building;GUIDesigner;Java; DESKTOP_MIMES -StartupWMClass=com.oracle.javafx.scenebuilder.app.SceneBuilderApp \ No newline at end of file +StartupWMClass=com.oracle.javafx.scenebuilder.app.SceneBuilderApp From 09f709cd6263cf6789c3181ed860725735b2bca0 Mon Sep 17 00:00:00 2001 From: kske Date: Wed, 19 Jan 2022 13:31:49 +0100 Subject: [PATCH 2/2] Move Linux desktop entry categories to workflow The given categories are resolved by jpackage and placed inside the resulting desktop entry. --- .github/workflows/linux.yml | 4 +++- app/assets/linux/SceneBuilder.desktop | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c9cd0392c..bbab8f688 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -49,6 +49,7 @@ jobs: --java-options '"-Djdk.gtk.version=2"' \ --java-options '"--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED"' \ --java-options '"-Djava.library.path=/opt/scenebuilder/lib/runtime/bin:/opt/scenebuilder/lib/runtime/lib"' \ + --linux-menu-group '"Development;Building;GUIDesigner;Java;"' \ --resource-dir app/assets/linux --install-dir /opt \ --type deb @@ -58,6 +59,7 @@ jobs: --icon app/assets/linux/icon-linux.png \ --java-options '"-Djdk.gtk.version=2"' \ --java-options '"--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED"' \ + --linux-menu-group '"Development;Building;GUIDesigner;Java;"' \ --resource-dir app/assets/linux --install-dir /opt \ --type rpm @@ -83,4 +85,4 @@ jobs: env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - S3_PATH: ${{ steps.variables.outputs.S3_PATH }} \ No newline at end of file + S3_PATH: ${{ steps.variables.outputs.S3_PATH }} diff --git a/app/assets/linux/SceneBuilder.desktop b/app/assets/linux/SceneBuilder.desktop index e5cd0f87d..19c0ce78b 100644 --- a/app/assets/linux/SceneBuilder.desktop +++ b/app/assets/linux/SceneBuilder.desktop @@ -5,6 +5,6 @@ Exec=APPLICATION_LAUNCHER Icon=APPLICATION_ICON Terminal=false Type=Application -Categories=Development;Building;GUIDesigner;Java; +Categories=DEPLOY_BUNDLE_CATEGORY DESKTOP_MIMES StartupWMClass=com.oracle.javafx.scenebuilder.app.SceneBuilderApp