diff --git a/build.gradle b/build.gradle index 65faa187..d57c77ea 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ tasks.withType(AbstractArchiveTask) { } javafx { - version = headless ? "18" : "22" + version = headless ? "18" : "23.0.1" modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ] } diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java index d311994d..9da23ce9 100644 --- a/src/main/java/com/sparrowwallet/sparrow/AppController.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java @@ -274,7 +274,7 @@ public class AppController implements Initializable { } void initializeView() { - setPlatformApplicationMenu(); + Platform.runLater(this::setPlatformApplicationMenu); rootStack.getScene().getWindow().setOnHiding(windowEvent -> { if(searchWalletDialog != null && searchWalletDialog.isShowing()) { @@ -450,7 +450,7 @@ public class AppController implements Initializable { OsType osType = OsType.getCurrent(); if(osType == OsType.MACOS) { MenuToolkit tk = MenuToolkit.toolkit(); - MenuItem preferences = new MenuItem("Preferences..."); + MenuItem preferences = new MenuItem("Settings..."); preferences.setOnAction(this::openPreferences); preferences.setAccelerator(new KeyCodeCombination(KeyCode.COMMA, KeyCombination.META_DOWN)); Menu defaultApplicationMenu = new Menu("Apple", null, tk.createAboutMenuItem(SparrowWallet.APP_NAME, getAboutStage()), new SeparatorMenuItem(),