From 820d4ff5735d2addf086e7a1908a4277ebbca65f Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Wed, 23 Aug 2023 13:17:38 +0200 Subject: [PATCH] disabled right click on add vault button and enhanced naming --- .../ui/mainwindow/VaultListController.java | 33 ++++++++++--------- src/main/resources/i18n/strings.properties | 4 ++- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java index 97d8738a4..a04a71482 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java @@ -22,6 +22,7 @@ import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ObservableValue; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; +import javafx.event.Event; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.ContextMenu; @@ -145,30 +146,32 @@ public class VaultListController implements FxController { root.setOnDragDropped(this::handleDragEvent); root.setOnDragExited(this::handleDragEvent); - initAddVaultBtnContextMenu(); + createAddVaultContextMenu(); } - private void initAddVaultBtnContextMenu() { + private void createAddVaultContextMenu() { ContextMenu contextMenu = new ContextMenu(); + FontAwesome5IconView newIcon = new FontAwesome5IconView(); + newIcon.setGlyph(FontAwesome5Icon.PLUS); + newIcon.setTextAlignment(TextAlignment.CENTER); + newIcon.setWrappingWidth(14); + + MenuItem newVaultMenuItem = new MenuItem(resourceBundle.getString("addvaultwizard.welcome.newButton"), newIcon); + newVaultMenuItem.setOnAction(event -> didClickAddNewVault()); + newVaultMenuItem.getStyleClass().add("add-vault-menu-item"); + FontAwesome5IconView addIcon = new FontAwesome5IconView(); - addIcon.setGlyph(FontAwesome5Icon.PLUS); + addIcon.setGlyph(FontAwesome5Icon.FOLDER_OPEN); addIcon.setTextAlignment(TextAlignment.CENTER); addIcon.setWrappingWidth(14); - MenuItem item1 = new MenuItem(resourceBundle.getString("addvaultwizard.welcome.newButton"), addIcon); - item1.setOnAction(event -> didClickAddNewVault()); - item1.getStyleClass().add("add-vault-menu-item"); + MenuItem existingVaultMenuItem = new MenuItem(resourceBundle.getString("addvaultwizard.welcome.existingButton"), addIcon); + existingVaultMenuItem.setOnAction(event -> didClickAddExistingVault()); + existingVaultMenuItem.getStyleClass().add("add-vault-menu-item"); - FontAwesome5IconView openIcon = new FontAwesome5IconView(); - openIcon.setGlyph(FontAwesome5Icon.FOLDER_OPEN); - openIcon.setTextAlignment(TextAlignment.CENTER); - openIcon.setWrappingWidth(14); + contextMenu.getItems().addAll(newVaultMenuItem, existingVaultMenuItem); - MenuItem item2 = new MenuItem(resourceBundle.getString("addvaultwizard.welcome.existingButton"), openIcon); - item2.setOnAction(event -> didClickAddExistingVault()); - item2.getStyleClass().add("add-vault-menu-item"); - - contextMenu.getItems().addAll(item1, item2); + addVaultBtn.addEventFilter(ContextMenuEvent.CONTEXT_MENU_REQUESTED, Event::consume); addVaultBtn.setContextMenu(contextMenu); } diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index b558691bb..45b5c4006 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -367,7 +367,9 @@ main.vaultlist.contextMenu.unlock=Unlock… main.vaultlist.contextMenu.unlockNow=Unlock Now main.vaultlist.contextMenu.vaultoptions=Show Vault Options main.vaultlist.contextMenu.reveal=Reveal Drive -main.vaultlist.addVaultBtn=Add Vault +main.vaultlist.addVaultBtn=Add +main.vaultlist.addVaultBtn.menuItemNew=New Vault +main.vaultlist.addVaultBtn.menuItemExisting=Existing Vault ## Vault Detail ### Welcome main.vaultDetail.welcomeOnboarding=Thanks for choosing Cryptomator to protect your files. If you need any assistance, check out our getting started guides: