diff --git a/branding/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/actions/Bundle.properties b/branding/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/actions/Bundle.properties index f2f7017..6149100 100644 --- a/branding/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/actions/Bundle.properties +++ b/branding/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/actions/Bundle.properties @@ -1 +1,2 @@ MSG_LogTab_name=&Log +MSG_ShortLogTab_name=Log diff --git a/cric.png b/cric.png new file mode 100644 index 0000000..6787c0b Binary files /dev/null and b/cric.png differ diff --git a/main/src/main/java/se/trixon/cric/core/ExecutorManager.java b/main/src/main/java/se/trixon/cric/core/ExecutorManager.java index ea25380..13a4e90 100644 --- a/main/src/main/java/se/trixon/cric/core/ExecutorManager.java +++ b/main/src/main/java/se/trixon/cric/core/ExecutorManager.java @@ -15,6 +15,7 @@ */ package se.trixon.cric.core; +import java.awt.Dimension; import java.util.HashMap; import java.util.ResourceBundle; import javafx.scene.Scene; @@ -39,6 +40,7 @@ public class ExecutorManager { private final ResourceBundle mBundle = NbBundle.getBundle(ExecutorManager.class); private final HashMap mExecutors = new HashMap<>(); private InputOutput mInputOutput; + private final Dimension mPreferredSize = SwingHelper.getUIScaledDim(800, 600); public static ExecutorManager getInstance() { return Holder.INSTANCE; @@ -62,7 +64,7 @@ protected void fxConstructor() { setScene(new Scene(taskInfoPane)); } }; - dialogPanel.setPreferredSize(SwingHelper.getUIScaledDim(640, 300)); + dialogPanel.setPreferredSize(mPreferredSize); SwingUtilities.invokeLater(() -> { var title = Dict.Dialog.TITLE_TASK_RUN_S.toString().formatted(task.getName()); diff --git a/main/src/main/java/se/trixon/cric/ui/TaskListEditor.java b/main/src/main/java/se/trixon/cric/ui/TaskListEditor.java index 6910622..90a510c 100644 --- a/main/src/main/java/se/trixon/cric/ui/TaskListEditor.java +++ b/main/src/main/java/se/trixon/cric/ui/TaskListEditor.java @@ -44,7 +44,7 @@ public class TaskListEditor { private EditableList mEditableList; private final ExecutorManager mExecutorManager = ExecutorManager.getInstance(); - private final Dimension mPreferredSize = SwingHelper.getUIScaledDim(740, 480); + private final Dimension mPreferredSize = SwingHelper.getUIScaledDim(800, 600); private final TaskEditor mTaskEditor; private final Scene mTaskEditorScene; private final TaskManager mTaskManager = TaskManager.getInstance(); diff --git a/packaging/snap/snap/gui/cric.desktop b/packaging/snap/snap/gui/cric.desktop index df718c2..e124cf8 100755 --- a/packaging/snap/snap/gui/cric.desktop +++ b/packaging/snap/snap/gui/cric.desktop @@ -8,4 +8,4 @@ Icon=${SNAP}/meta/gui/cric.png Terminal=false Categories=Development; StartupNotify=true -StartupWMClass=se.trixon.cric.app +StartupWMClass=CRIC diff --git a/packaging/snap/snap/local/launcher b/packaging/snap/snap/local/launcher deleted file mode 100755 index 72dae73..0000000 --- a/packaging/snap/snap/local/launcher +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -export DESKTOP_SESSION=gnome -export XDG_SESSION_DESKTOP=gnome -export XDG_CURRENT_DESKTOP=GNOME - -$SNAP/jre/bin/java -jar -Duser.home=$SNAP_USER_COMMON $SNAP/cric/cric-$SNAP_VERSION.jar diff --git a/packaging/snap/snap/snapcraft.yaml b/packaging/snap/snap/snapcraft.yaml index 47b05e7..2581af8 100644 --- a/packaging/snap/snap/snapcraft.yaml +++ b/packaging/snap/snap/snapcraft.yaml @@ -1,7 +1,7 @@ name: cric title: CRIC -base: core18 -version: 1.0.2 +base: core22 +version: 'REPLACE_WITH_VERSION' summary: A Java jlink ui - a Custom Runtime Image Creator description: | **CRIC** is a gui for the Java jlink command. @@ -20,44 +20,31 @@ license: Apache-2.0 apps: cric: - command: bin/launcher - extensions: - - gnome-3-34 + command: cric/bin/cric + extensions: [gnome] plugs: - home - removable-media + - network parts: cric: plugin: dump - #source: https://github.com/trixon/cric/releases/download/v$SNAPCRAFT_PROJECT_VERSION/cric-$SNAPCRAFT_PROJECT_VERSION-bin.zip - source: /root/project/cric-$SNAPCRAFT_PROJECT_VERSION-bin.zip + #source: https://github.com/trixon/cric/releases/download/v$SNAPCRAFT_PROJECT_VERSION/cric-$SNAPCRAFT_PROJECT_VERSION-linux.zip + source: /root/project/cric-$SNAPCRAFT_PROJECT_VERSION-linux.zip source-type: zip - organize: - '*' : cric - launcher: - plugin: dump - source: snap/local - organize: - 'launcher': 'bin/' - - apt: - plugin: nil - override-build: | - apt install openjdk-11-jdk -y - - jlink: + config: + after: [cric] plugin: nil - after: [apt] - override-build: | - rm -rf $SNAPCRAFT_PRIME/jre - - jlink --no-header-files \ - --no-man-pages \ - --strip-debug \ - --compress=1 \ - --add-modules java.base,java.datatransfer,java.desktop,java.logging,java.prefs,java.sql,java.xml,jdk.jfr,jdk.unsupported,jdk.unsupported.desktop \ - --output $SNAPCRAFT_PRIME/yaya/jre - - strip -p --strip-unneeded $SNAPCRAFT_PRIME/jre/lib/server/libjvm.so + override-prime: | + craftctl default + sed -i 's/${HOME}\/.${APPNAME}/${SNAP_USER_COMMON}\/.cric/' /root/prime/cric/bin/cric + sed -i 's/${HOME}\/.cache\/${APPNAME}/${SNAP_USER_COMMON}\/.cache\/cric/' /root/prime/cric/bin/cric + rm -r /root/prime/cric/platform/modules/lib/i386 + rm -r /root/prime/cric/platform/modules/lib/x86 + rm /root/prime/cric/platform/lib/*.dll + rm /root/prime/cric/platform/lib/*.exe + +lint: + ignore: [library]