From 76c9a194286255aeeb132f496267a4d891c8d9cf Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 25 May 2016 12:29:49 +0200 Subject: [PATCH] unset and set default buttons to make sure VK_ENTER triggers it --- .../cryptomator/ui/controllers/ChangePasswordController.java | 3 +++ .../org/cryptomator/ui/controllers/InitializeController.java | 3 +++ .../java/org/cryptomator/ui/controllers/UnlockController.java | 3 +++ .../org/cryptomator/ui/controllers/UpgradeController.java | 4 ++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java index e74e2d9a4..b1a76529b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java @@ -122,6 +122,9 @@ public class ChangePasswordController extends LocalizedFXMLViewController { oldPasswordField.clear(); newPasswordField.clear(); retypePasswordField.clear(); + // trigger "default" change to refresh key bindings: + changePasswordButton.setDefaultButton(false); + changePasswordButton.setDefaultButton(true); } // **************************************** diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java index 6625423fe..2989e9eaf 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java @@ -108,6 +108,9 @@ public class InitializeController extends LocalizedFXMLViewController { private void vaultDidChange(Vault newVault) { passwordField.clear(); retypePasswordField.clear(); + // trigger "default" change to refresh key bindings: + okButton.setDefaultButton(false); + okButton.setDefaultButton(true); } // **************************************** diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java index 1f34ae6f9..ad8cd5cac 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java @@ -149,6 +149,9 @@ public class UnlockController extends LocalizedFXMLViewController { if (SystemUtils.IS_OS_WINDOWS) { chooseSelectedDriveLetter(); } + // trigger "default" change to refresh key bindings: + unlockButton.setDefaultButton(false); + unlockButton.setDefaultButton(true); } // **************************************** diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java index 9dcc57d0f..f559fa50d 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java @@ -58,7 +58,7 @@ public class UpgradeController extends LocalizedFXMLViewController { return instruction.map(this::upgradeNotification).orElse(""); }).orElse("")); - EasyBind.subscribe(vault, this::vaultChanged); + EasyBind.subscribe(vault, this::vaultDidChange); } @Override @@ -66,7 +66,7 @@ public class UpgradeController extends LocalizedFXMLViewController { return getClass().getResource("/fxml/upgrade.fxml"); } - private void vaultChanged(Vault newVault) { + private void vaultDidChange(Vault newVault) { errorLabel.setText(null); }