diff --git a/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java index 337f653dd..752dd7f16 100644 --- a/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java +++ b/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java @@ -4,6 +4,8 @@ package org.cryptomator.ui.controls; * Inspired by de.jensd:fontawesomefx-fontawesome */ public enum FontAwesome5Icon { + ARROW_RIGH("\uF061"), + LONG_ARROW_ALT_RIGHT("\uF30B"), ANCHOR("\uF13D"), // ARROW_UP("\uF062"), // BAN("\uF05E"), // diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java index 2e935eb25..6a44cb74a 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java @@ -11,7 +11,9 @@ import org.cryptomator.integrations.mount.Mountpoint; import org.cryptomator.integrations.revealpath.RevealFailedException; import org.cryptomator.integrations.revealpath.RevealPathService; import org.cryptomator.ui.common.FxController; +import org.cryptomator.ui.common.StageFactory; import org.cryptomator.ui.common.VaultService; +import org.cryptomator.ui.dialogs.SimpleDialog; import org.cryptomator.ui.fxapp.FxApplicationWindows; import org.cryptomator.ui.stats.VaultStatisticsComponent; import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent; @@ -156,7 +158,7 @@ public class VaultDetailUnlockedController implements FxController { public void chooseFileAndReveal() { Preconditions.checkState(accessibleViaPath.getValue()); var fileChooser = new FileChooser(); - fileChooser.setTitle(resourceBundle.getString("main.vaultDetail.filePickerTitle")); + fileChooser.setTitle(resourceBundle.getString("main.vaultDetail.decryptedFilePickerTitle")); fileChooser.setInitialDirectory(Path.of(mountPoint.getValue()).toFile()); var cleartextFile = fileChooser.showOpenDialog(mainWindow); if (cleartextFile != null) { @@ -168,7 +170,7 @@ public class VaultDetailUnlockedController implements FxController { @FXML public void chooseEncryptedFileAndGetName() { var fileChooser = new FileChooser(); - fileChooser.setTitle(resourceBundle.getString("main.vaultDetail.filePickerTitle")); + fileChooser.setTitle(resourceBundle.getString("main.vaultDetail.encryptedFilePickerTitle")); fileChooser.setInitialDirectory(vault.getValue().getPath().toFile()); var ciphertextNode = fileChooser.showOpenDialog(mainWindow); diff --git a/src/main/resources/css/courierprime_regular.ttf b/src/main/resources/css/courierprime_regular.ttf new file mode 100644 index 000000000..4af1ff54c Binary files /dev/null and b/src/main/resources/css/courierprime_regular.ttf differ diff --git a/src/main/resources/css/light_theme.css b/src/main/resources/css/light_theme.css index 11cb1a9df..fd682ad26 100644 --- a/src/main/resources/css/light_theme.css +++ b/src/main/resources/css/light_theme.css @@ -16,6 +16,10 @@ src: url('opensans_bold.ttf'); } +@font-face { + src: url('courierprime_regular.ttf'); +} + /******************************************************************************* * * * Root Styling & Colors * @@ -925,6 +929,13 @@ -fx-border-width: 1px; } +.cryptic-text { + -fx-background-color: MAIN_BG; + -fx-text-fill: TEXT_FILL; + -fx-font-family: 'Courier Prime'; + -fx-font-size: 1.1em; +} + .button.drag-n-drop:focused { -fx-border-color: CONTROL_BORDER_FOCUSED; } diff --git a/src/main/resources/fxml/vault_detail_unlocked.fxml b/src/main/resources/fxml/vault_detail_unlocked.fxml index 37c6d2101..f0cba7cf3 100644 --- a/src/main/resources/fxml/vault_detail_unlocked.fxml +++ b/src/main/resources/fxml/vault_detail_unlocked.fxml @@ -1,13 +1,14 @@ + + - - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index ca3546586..1ca235253 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -423,7 +423,7 @@ main.vaultDetail.stats=Vault Statistics main.vaultDetail.locateEncryptedFileBtn=Locate Encrypted File main.vaultDetail.locateEncryptedFileBtn.tooltip=Choose a file from your vault to locate its encrypted counterpart main.vaultDetail.encryptedPathsCopied=Paths Copied to Clipboard! -main.vaultDetail.filePickerTitle=Select File Inside Vault +main.vaultDetail.decryptedFilePickerTitle=Select File Inside Vault ### Missing main.vaultDetail.missing.info=Cryptomator could not find a vault at this path. main.vaultDetail.missing.recheck=Recheck