Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show cancel button in wallet password prompt #1765

Merged
merged 3 commits into from Oct 10, 2018
Merged

Show cancel button in wallet password prompt #1765

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
269912d
Show cancel button in wallet password prompt
devinbileck Oct 8, 2018
c76fd59
Reworked implementation so as not to affect other uses of the
devinbileck Oct 9, 2018
1d17954
Hide the forgot password button in the SeedWordsView
devinbileck Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/MainViewModel.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 4 additions & 3 deletions desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -248,7 +247,6 @@ private void addButtons() {
cancelButton.setOnAction(event -> {
hide();
closeHandlerOptional.ifPresent(Runnable::run);
BisqApp.getShutDownHandler().run();
});

HBox hBox = new HBox();
Expand All @@ -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);


Expand Down