Browse Source

tweaks and fixes

bwt
Craig Raw 4 years ago
parent
commit
a188f70dbe
  1. 3
      src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreImportPane.java
  2. 2
      src/main/java/com/sparrowwallet/sparrow/wallet/WalletController.java
  3. 4
      src/main/resources/com/sparrowwallet/sparrow/general.css
  4. 4
      src/main/resources/com/sparrowwallet/sparrow/transaction/headers.css

3
src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreImportPane.java

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

2
src/main/java/com/sparrowwallet/sparrow/wallet/WalletController.java

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

4
src/main/resources/com/sparrowwallet/sparrow/general.css

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

4
src/main/resources/com/sparrowwallet/sparrow/transaction/headers.css

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

Loading…
Cancel
Save