From 269912d1bb3d65f701e2265ca8eb06129f38c17b Mon Sep 17 00:00:00 2001 From: Devin Bileck <603793+devinbileck@users.noreply.github.com> Date: Mon, 8 Oct 2018 15:51:36 -0700 Subject: [PATCH 1/3] Show cancel button in wallet password prompt --- .../main/overlays/windows/WalletPasswordWindow.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java index 4c8038402ed..f4965c374bc 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java @@ -17,6 +17,7 @@ package bisq.desktop.main.overlays.windows; +import bisq.desktop.app.BisqApp; import bisq.desktop.components.AutoTooltipButton; import bisq.desktop.components.AutoTooltipLabel; import bisq.desktop.components.BusyAnimation; @@ -247,6 +248,7 @@ private void addButtons() { cancelButton.setOnAction(event -> { hide(); closeHandlerOptional.ifPresent(Runnable::run); + BisqApp.getShutDownHandler().run(); }); HBox hBox = new HBox(); @@ -255,10 +257,7 @@ private void addButtons() { GridPane.setRowIndex(hBox, ++rowIndex); GridPane.setColumnIndex(hBox, 1); hBox.setAlignment(Pos.CENTER_LEFT); - if (hideCloseButton) - hBox.getChildren().addAll(unlockButton, forgotPasswordButton, busyAnimation, deriveStatusLabel); - else - hBox.getChildren().addAll(unlockButton, cancelButton); + hBox.getChildren().addAll(unlockButton, forgotPasswordButton, cancelButton, busyAnimation, deriveStatusLabel); gridPane.getChildren().add(hBox); From c76fd598cdeda1a404590e524d7e41cf95c4170d Mon Sep 17 00:00:00 2001 From: Devin Bileck <603793+devinbileck@users.noreply.github.com> Date: Mon, 8 Oct 2018 23:08:17 -0700 Subject: [PATCH 2/3] Reworked implementation so as not to affect other uses of the WalletPasswordWindow --- desktop/src/main/java/bisq/desktop/main/MainViewModel.java | 3 ++- .../main/overlays/windows/WalletPasswordWindow.java | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java index f5cded52a39..21cff615b22 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java @@ -17,6 +17,7 @@ package bisq.desktop.main; +import bisq.desktop.app.BisqApp; import bisq.desktop.common.model.ViewModel; import bisq.desktop.components.BalanceWithConfirmationTextField; import bisq.desktop.components.TxIdTextField; @@ -291,7 +292,7 @@ private void setupHandlers() { bisqSetup.setShowFirstPopupIfResyncSPVRequestedHandler(this::showFirstPopupIfResyncSPVRequested); bisqSetup.setRequestWalletPasswordHandler(aesKeyHandler -> walletPasswordWindow .onAesKey(aesKeyHandler::accept) - .hideCloseButton() + .onClose(() -> BisqApp.getShutDownHandler().run()) .show()); bisqSetup.setDisplayUpdateHandler((alert, key) -> new DisplayUpdateDownloadWindow(alert) diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java index f4965c374bc..7a475e7067d 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java @@ -17,7 +17,6 @@ package bisq.desktop.main.overlays.windows; -import bisq.desktop.app.BisqApp; import bisq.desktop.components.AutoTooltipButton; import bisq.desktop.components.AutoTooltipLabel; import bisq.desktop.components.BusyAnimation; @@ -248,7 +247,6 @@ private void addButtons() { cancelButton.setOnAction(event -> { hide(); closeHandlerOptional.ifPresent(Runnable::run); - BisqApp.getShutDownHandler().run(); }); HBox hBox = new HBox(); @@ -257,7 +255,10 @@ private void addButtons() { GridPane.setRowIndex(hBox, ++rowIndex); GridPane.setColumnIndex(hBox, 1); hBox.setAlignment(Pos.CENTER_LEFT); - hBox.getChildren().addAll(unlockButton, forgotPasswordButton, cancelButton, busyAnimation, deriveStatusLabel); + if (hideCloseButton) + hBox.getChildren().addAll(unlockButton, forgotPasswordButton, busyAnimation, deriveStatusLabel); + else + hBox.getChildren().addAll(unlockButton, forgotPasswordButton, cancelButton, busyAnimation, deriveStatusLabel); gridPane.getChildren().add(hBox); From 1d179544f6df43a49aad1d2db9779ef5e97bad01 Mon Sep 17 00:00:00 2001 From: Devin Bileck <603793+devinbileck@users.noreply.github.com> Date: Tue, 9 Oct 2018 00:14:43 -0700 Subject: [PATCH 3/3] Hide the forgot password button in the SeedWordsView --- .../account/content/seedwords/SeedWordsView.java | 2 +- .../overlays/windows/WalletPasswordWindow.java | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.java index 663a5455751..08c824a12cc 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.java @@ -203,7 +203,7 @@ private void askForPassword() { walletPasswordWindow.headLine(Res.get("account.seed.enterPw")).onAesKey(aesKey -> { initSeedWords(walletsManager.getDecryptedSeed(aesKey, btcWalletService.getKeyChainSeed(), btcWalletService.getKeyCrypter())); showSeedScreen(); - }).show(); + }).hideForgotPasswordButton().show(); } private void initSeedWords(DeterministicSeed seed) { diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java index 7a475e7067d..08db0cdbe82 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java @@ -104,6 +104,7 @@ public class WalletPasswordWindow extends Overlay { private ChangeListener wordsTextAreaChangeListener; private ChangeListener seedWordsValidChangeListener; private LocalDate walletCreationDate; + private boolean hideForgotPasswordButton = false; /////////////////////////////////////////////////////////////////////////////////////////// @@ -152,6 +153,11 @@ public WalletPasswordWindow onAesKey(AesKeyHandler aesKeyHandler) { return this; } + public WalletPasswordWindow hideForgotPasswordButton() { + this.hideForgotPasswordButton = true; + return this; + } + @Override protected void cleanup() { if (passwordTextField != null) @@ -255,10 +261,12 @@ private void addButtons() { GridPane.setRowIndex(hBox, ++rowIndex); GridPane.setColumnIndex(hBox, 1); hBox.setAlignment(Pos.CENTER_LEFT); - if (hideCloseButton) - hBox.getChildren().addAll(unlockButton, forgotPasswordButton, busyAnimation, deriveStatusLabel); - else - hBox.getChildren().addAll(unlockButton, forgotPasswordButton, cancelButton, busyAnimation, deriveStatusLabel); + hBox.getChildren().add(unlockButton); + if (!hideForgotPasswordButton) + hBox.getChildren().add(forgotPasswordButton); + if (!hideCloseButton) + hBox.getChildren().add(cancelButton); + hBox.getChildren().addAll(busyAnimation, deriveStatusLabel); gridPane.getChildren().add(hBox);