mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 02:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

added text flow styling, localized preferences title, renamed some i18n keys

Browse Source
This commit is contained in:
Tobias Hagemann
2019-07-26 14:05:19 +02:00
parent 036dca33be
commit 4931e6707a
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
View File

@@ -27,9 +27,9 @@ abstract class PreferencesModule {
@Provides @Provides
@PreferencesWindow @PreferencesWindow
@PreferencesScoped @PreferencesScoped
static Stage provideStage() { static Stage provideStage(ResourceBundle resourceBundle) {
Stage stage = new Stage(); Stage stage = new Stage();
stage.setTitle("Preferences"); stage.setTitle(resourceBundle.getString("preferences.title"));
stage.setMinWidth(400); stage.setMinWidth(400);
stage.setMinHeight(300); stage.setMinHeight(300);
stage.initModality(Modality.APPLICATION_MODAL); stage.initModality(Modality.APPLICATION_MODAL);

6
main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
View File

@@ -101,9 +101,9 @@ public class UnlockController implements FxController {
private void didClickSavePasswordCheckbox() { private void didClickSavePasswordCheckbox() {
if (!savePassword.isSelected() && hasStoredPassword()) { if (!savePassword.isSelected() && hasStoredPassword()) {
Alert confirmDialog = DialogBuilderUtil.buildConfirmationDialog( // Alert confirmDialog = DialogBuilderUtil.buildConfirmationDialog( //
resourceBundle.getString("unlock.savePassword.delete.confirmation.title"), // resourceBundle.getString("unlock.deleteSavedPasswordDialog.title"), //
resourceBundle.getString("unlock.savePassword.delete.confirmation.header"), // resourceBundle.getString("unlock.deleteSavedPasswordDialog.header"), //
resourceBundle.getString("unlock.savePassword.delete.confirmation.content"), // resourceBundle.getString("unlock.deleteSavedPasswordDialog.content"), //
SystemUtils.IS_OS_MAC_OSX ? ButtonType.CANCEL : ButtonType.OK); SystemUtils.IS_OS_MAC_OSX ? ButtonType.CANCEL : ButtonType.OK);
Optional<ButtonType> choice = confirmDialog.showAndWait(); Optional<ButtonType> choice = confirmDialog.showAndWait();
if (ButtonType.OK.equals(choice.get())) { if (ButtonType.OK.equals(choice.get())) {

4
main/ui/src/main/resources/css/dark_theme.css
View File

@@ -32,6 +32,10 @@
-fx-text-fill: TEXT_FILL; -fx-text-fill: TEXT_FILL;
} }
.text-flow > * {
-fx-fill: TEXT_FILL;
}
/******************************************************************************* /*******************************************************************************
* * * *
* Main Window * * Main Window *

4
main/ui/src/main/resources/css/light_theme.css
View File

@@ -32,6 +32,10 @@
-fx-text-fill: TEXT_FILL; -fx-text-fill: TEXT_FILL;
} }
.text-flow > * {
-fx-fill: TEXT_FILL;
}
/******************************************************************************* /*******************************************************************************
* * * *
* Main Window * * Main Window *

7
main/ui/src/main/resources/i18n/strings.properties
View File

@@ -2,11 +2,12 @@ addvaultwizard.existing.instruction=Please choose the masterkey.cryptomator file
addvaultwizard.existing.filePickerTitle=Open Masterkey File addvaultwizard.existing.filePickerTitle=Open Masterkey File
main.closeBtn.tooltip=Close main.closeBtn.tooltip=Close
main.settingsBtn.tooltip=Settings main.settingsBtn.tooltip=Settings
preferences.title=Preferences
preferences.autoUpdateCheck=Check for updates automatically preferences.autoUpdateCheck=Check for updates automatically
preferences.debugLogging=Enable debug logging preferences.debugLogging=Enable debug logging
preferences.theme=Look & Feel preferences.theme=Look & Feel
preferences.volumeType=Volume type preferences.volumeType=Volume type
unlock.savePassword.delete.confirmation.title=Delete Saved Password unlock.deleteSavedPasswordDialog.title=Delete Saved Password
unlock.savePassword.delete.confirmation.header=Do you really want to delete the saved password of this vault? unlock.deleteSavedPasswordDialog.header=Do you really want to delete the saved password of this vault?
unlock.savePassword.delete.confirmation.content=The saved password of this vault will be immediately deleted from your system keychain. If you'd like to save your password again, you'd have to unlock your vault with the "Save Password" option enabled. unlock.deleteSavedPasswordDialog.content=The saved password of this vault will be immediately deleted from your system keychain. If you'd like to save your password again, you'd have to unlock your vault with the "Save Password" option enabled.
vaultlist.emptyList.onboardingInstruction=Click here to add a vault vaultlist.emptyList.onboardingInstruction=Click here to add a vault