From b22ddaf13ebcc984f157d9fcae27f5bd587d93fb Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 26 Aug 2019 15:22:54 +0200 Subject: [PATCH] reveal vault access and storage location from vault detail view --- .../ui/mainwindow/VaultDetailController.java | 18 +++++++++++++++++- .../src/main/resources/fxml/vault_detail.fxml | 7 ++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java index 355337336..d951dead0 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java @@ -4,8 +4,11 @@ import javafx.beans.binding.Binding; import javafx.beans.binding.BooleanBinding; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyObjectProperty; +import javafx.event.ActionEvent; import javafx.fxml.FXML; +import javafx.scene.input.MouseEvent; import org.cryptomator.common.vaults.Vault; +import org.cryptomator.common.vaults.Volume; import org.cryptomator.ui.changepassword.ChangePasswordComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.Tasks; @@ -85,6 +88,20 @@ public class VaultDetailController implements FxController { changePasswordWindow.vault(vault.get()).build().showChangePasswordWindow(); } + @FXML + public void revealStorageLocation(ActionEvent actionEvent) { + application.getHostServices().showDocument(vault.get().getPath().toUri().toString()); + } + + @FXML + public void revealAccessLocation(MouseEvent mouseEvent) { + try { + vault.get().reveal(); + } catch (Volume.VolumeException e) { + LOG.error("Failed to reveal vault.", e); + } + } + /* Observable Properties */ public ReadOnlyObjectProperty vaultProperty() { @@ -110,5 +127,4 @@ public class VaultDetailController implements FxController { public boolean isAnyVaultSelected() { return anyVaultSelected.get(); } - } diff --git a/main/ui/src/main/resources/fxml/vault_detail.fxml b/main/ui/src/main/resources/fxml/vault_detail.fxml index 90882cf9f..f5ae169a9 100644 --- a/main/ui/src/main/resources/fxml/vault_detail.fxml +++ b/main/ui/src/main/resources/fxml/vault_detail.fxml @@ -2,6 +2,7 @@ + @@ -44,16 +45,16 @@ - + - +