tweaks and fixes

This commit is contained in:
Craig Raw 2020-07-21 08:52:21 +02:00
parent fca55779bf
commit a188f70dbe
4 changed files with 10 additions and 3 deletions

View file

@ -84,6 +84,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
importButton = new SplitMenuButton(); importButton = new SplitMenuButton();
importButton.setAlignment(Pos.CENTER_RIGHT); importButton.setAlignment(Pos.CENTER_RIGHT);
importButton.setText("Import Keystore"); importButton.setText("Import Keystore");
importButton.getStyleClass().add("default-button");
importButton.setOnAction(event -> { importButton.setOnAction(event -> {
importButton.setDisable(true); importButton.setDisable(true);
importKeystore(wallet.getScriptType().getDefaultDerivation(), false); importKeystore(wallet.getScriptType().getDefaultDerivation(), false);
@ -155,11 +156,13 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
}); });
confirmButton.managedProperty().bind(confirmButton.visibleProperty()); confirmButton.managedProperty().bind(confirmButton.visibleProperty());
confirmButton.setVisible(false); confirmButton.setVisible(false);
confirmButton.setDefaultButton(true);
buttonPane.getChildren().add(confirmButton); buttonPane.getChildren().add(confirmButton);
AnchorPane.setRightAnchor(confirmButton, 0.0); AnchorPane.setRightAnchor(confirmButton, 0.0);
verifyButton = new Button("Verify"); verifyButton = new Button("Verify");
verifyButton.setDisable(true); verifyButton.setDisable(true);
verifyButton.setDefaultButton(true);
verifyButton.setOnAction(event -> { verifyButton.setOnAction(event -> {
prepareImport(); prepareImport();
}); });

View file

@ -104,7 +104,7 @@ public class WalletController extends WalletFormController implements Initializa
@Subscribe @Subscribe
public void walletSettingsChanged(WalletSettingsChangedEvent event) { public void walletSettingsChanged(WalletSettingsChangedEvent event) {
if(event.getWalletFile().equals(walletForm.getWalletFile())) { if(event.getWalletFile().equals(walletForm.getWalletFile())) {
configure(walletForm.getWallet().isValid()); configure(event.getWallet().isValid());
} }
} }

View file

@ -122,3 +122,7 @@
.help-label { .help-label {
-fx-padding: 0 0 0 10; -fx-padding: 0 0 0 10;
} }
.default-button {
-fx-base: -fx-default-button;
}

View file

@ -79,11 +79,11 @@
} }
.segment0 .progress-bar { .segment0 .progress-bar {
-fx-accent: CHART_COLOR_3;
} }
.segment1 .progress-bar { .segment1 .progress-bar {
-fx-accent: CHART_COLOR_4; -fx-accent: CHART_COLOR_3;
} }
.segment2 .progress-bar { .segment2 .progress-bar {