diff --git a/PhotoSlide/pom.xml b/PhotoSlide/pom.xml
index c52f450..8e87c35 100644
--- a/PhotoSlide/pom.xml
+++ b/PhotoSlide/pom.xml
@@ -7,7 +7,7 @@
org.photoslide
PhotoSlide
- 1.5.0-RELEASE
+ 1.5.1-RELEASE
Photoslide is an app for managing and editing photos like Lightroom/ON1/...
@@ -17,7 +17,7 @@
org.photoslide.App
Photoslide
yy.ww.WWkkmm
- 1.5.0
+ 1.5.1
java.base,jdk.management,java.naming,java.sql,java.transaction.xa,java.xml,jdk.unsupported,java.management,java.datatransfer,java.desktop,java.security.jgss,java.xml.crypto,jdk.javadoc,javafx.media,javafx.controls,javafx.fxml,javafx.graphics,javafx.base,javafx.swing,javafx.web,java.logging,jdk.charsets,java.se,java.net.http,java.prefs,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.localedata,java.compiler,jdk.net,java.instrument,java.scripting,java.rmi
UTF-8
23
@@ -371,7 +371,7 @@
${mainClass}
-
+
@@ -397,7 +397,7 @@
${mainClass}
-
+
@@ -423,7 +423,7 @@
${mainClass}
-
+
@@ -448,7 +448,7 @@
${mainClass}
-
+
diff --git a/PhotoSlide/src/main/java/org/photoslide/MainViewController.java b/PhotoSlide/src/main/java/org/photoslide/MainViewController.java
index f12aaa9..a27680e 100644
--- a/PhotoSlide/src/main/java/org/photoslide/MainViewController.java
+++ b/PhotoSlide/src/main/java/org/photoslide/MainViewController.java
@@ -76,7 +76,6 @@
import javafx.fxml.Initializable;
import javafx.geometry.Pos;
import javafx.geometry.VPos;
-import javafx.scene.Group;
import javafx.scene.Parent;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
@@ -110,7 +109,6 @@
import javafx.util.Duration;
import org.controlsfx.control.PopOver;
import org.controlsfx.control.TaskProgressView;
-import org.h2.engine.Setting;
import org.h2.fulltext.FullText;
import org.kordamp.ikonli.javafx.FontIcon;
import org.photoslide.bookmarksboard.BMBIcon;
@@ -216,6 +214,7 @@ public class MainViewController implements Initializable {
private FontIcon processListIcon;
private TaskProgressView taskProgressView;
private PopOver taskPopOver;
+ private final Paint activityColor = Paint.valueOf("#c5c5c5");
@FXML
private CollectionsController collectionsPaneController;
@@ -250,19 +249,19 @@ public void initialize(URL url, ResourceBundle rb) {
taskPopOver.setTitle("Taskmanager");
taskPopOver.setHeaderAlwaysVisible(true);
taskPopOver.setFadeInDuration(new Duration(100));
- taskPopOver.setContentNode(taskProgressView);
+ taskPopOver.setContentNode(taskProgressView);
taskProgressView.getTasks().addListener((Observable taskChange) -> {
if (!taskProgressView.getTasks().isEmpty()) {
processListIcon.setIconColor(Paint.valueOf("lightgreen"));
- } else {
- processListIcon.setIconColor(Paint.valueOf("#c5c5c5"));
+ } else {
+ processListIcon.setIconColor(activityColor);
}
});
processListIcon.iconColorProperty().addListener((o) -> {
if (!taskProgressView.getTasks().isEmpty()) {
processListIcon.setIconColor(Paint.valueOf("lightgreen"));
- } else {
- processListIcon.setIconColor(Paint.valueOf("#c5c5c5"));
+ } else {
+ processListIcon.setIconColor(activityColor);
}
});
taskProgressView.setPrefSize(300, 200);
diff --git a/PhotoSlide/src/main/resources/pkg-config/linux-jpackage.txt b/PhotoSlide/src/main/resources/pkg-config/linux-jpackage.txt
index f0e4570..1d385c6 100644
--- a/PhotoSlide/src/main/resources/pkg-config/linux-jpackage.txt
+++ b/PhotoSlide/src/main/resources/pkg-config/linux-jpackage.txt
@@ -9,7 +9,6 @@
--runtime-image ${project.build.directory}/jvm-image
--linux-shortcut
--java-options -XX:+UseZGC
---java-options -XX:+ZGenerational
--java-options -Xms2g
--java-options --enable-preview
--java-options --add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED
diff --git a/PhotoSlide/src/main/resources/pkg-config/mac-jpackage.txt b/PhotoSlide/src/main/resources/pkg-config/mac-jpackage.txt
index 3b971a3..a836144 100644
--- a/PhotoSlide/src/main/resources/pkg-config/mac-jpackage.txt
+++ b/PhotoSlide/src/main/resources/pkg-config/mac-jpackage.txt
@@ -9,7 +9,6 @@
--app-version ${app.version}
--runtime-image ${project.build.directory}/jvm-image
--java-options -XX:+UseZGC
---java-options -XX:+ZGenerational
--java-options -Xms2g
--java-options --enable-preview
--java-options --add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED
diff --git a/PhotoSlide/src/main/resources/pkg-config/win-jpackage.txt b/PhotoSlide/src/main/resources/pkg-config/win-jpackage.txt
index 04886d2..46473fb 100644
--- a/PhotoSlide/src/main/resources/pkg-config/win-jpackage.txt
+++ b/PhotoSlide/src/main/resources/pkg-config/win-jpackage.txt
@@ -16,7 +16,6 @@
--description "${project.description}"
--copyright "(C) ${windows.vendor}"
--java-options -XX:+UseZGC
---java-options -XX:+ZGenerational
--java-options -Xms2g
--java-options --enable-preview
--java-options --add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED