From cca6d475b3602b2d081a2993520d6aebacd24645 Mon Sep 17 00:00:00 2001 From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com> Date: Mon, 3 Jul 2023 21:14:12 +0200 Subject: [PATCH] Updated UI --- .../UnlockInvalidMountPointController.java | 22 ++++++++++++++----- .../fxml/unlock_invalid_mount_point.fxml | 3 ++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java index a45960a8b..2665f5f0e 100644 --- a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java +++ b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java @@ -52,12 +52,22 @@ public class UnlockInvalidMountPointController implements FxController { window.close(); } + public boolean isShowPreferences() { + return exceptionType.showPreferences; + } + @FXML public void closeAndOpenPreferences() { appWindows.showPreferencesWindow(SelectedPreferencesTab.VOLUME); window.close(); } + @FXML + public void closeAndOpenVaultOptions() { + //TODO + window.close(); + } + private ExceptionType getExceptionType(Throwable unlockException) { return switch (unlockException) { case MountPointNotSupportedException x -> ExceptionType.NOT_SUPPORTED; @@ -69,15 +79,17 @@ public class UnlockInvalidMountPointController implements FxController { private enum ExceptionType { - NOT_SUPPORTED("unlock.error.customPath.description.notSupported"), - NOT_EXISTING("unlock.error.customPath.description.notExists"), - IN_USE("unlock.error.customPath.description.inUse"), - GENERIC("unlock.error.customPath.description.generic"); + NOT_SUPPORTED("unlock.error.customPath.description.notSupported", true), + NOT_EXISTING("unlock.error.customPath.description.notExists", false), + IN_USE("unlock.error.customPath.description.inUse", false), + GENERIC("unlock.error.customPath.description.generic", true); private final String translationKey; + private final boolean showPreferences; - ExceptionType(String translationKey) { + ExceptionType(String translationKey, boolean showPreferences) { this.translationKey = translationKey; + this.showPreferences = showPreferences; } } } \ No newline at end of file diff --git a/src/main/resources/fxml/unlock_invalid_mount_point.fxml b/src/main/resources/fxml/unlock_invalid_mount_point.fxml index 1b52f568c..1646ef47a 100644 --- a/src/main/resources/fxml/unlock_invalid_mount_point.fxml +++ b/src/main/resources/fxml/unlock_invalid_mount_point.fxml @@ -46,7 +46,8 @@