sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ellipsis and incomplete wallet background save fixes

Browse source
This commit is contained in:
Craig Raw 2020-08-18 10:47:32 +02:00
parent df15129f64
commit ccf4e98968
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreImportPane.java
View file

@ -155,11 +155,11 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
if(!displayWordsOnly) { if(!displayWordsOnly) {
PassphraseEntry passphraseEntry = new PassphraseEntry(); PassphraseEntry passphraseEntry = new PassphraseEntry();
passphraseEntry.setPadding(new Insets(0, 32, 10, 10)); passphraseEntry.setPadding(new Insets(0, 26, 10, 10));
vBox.getChildren().add(passphraseEntry); vBox.getChildren().add(passphraseEntry);
AnchorPane buttonPane = new AnchorPane(); AnchorPane buttonPane = new AnchorPane();
buttonPane.setPadding(new Insets(0, 32, 0, 10)); buttonPane.setPadding(new Insets(0, 26, 0, 10));
generateButton = new Button("Generate New"); generateButton = new Button("Generate New");
generateButton.setOnAction(event -> { generateButton.setOnAction(event -> {
@ -345,7 +345,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
setSpacing(10); setSpacing(10);
Label label = new Label((wordNumber+1) + "."); Label label = new Label((wordNumber+1) + ".");
label.setPrefWidth(20); label.setPrefWidth(22);
label.setAlignment(Pos.CENTER_RIGHT); label.setAlignment(Pos.CENTER_RIGHT);
wordField = new TextField(); wordField = new TextField();
wordField.setMaxWidth(100); wordField.setMaxWidth(100);

2
src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java
View file

@ -29,7 +29,7 @@ public class WelcomeDialog extends Dialog<Mode> {
dialogPane.setHeaderText("Welcome to Sparrow!"); dialogPane.setHeaderText("Welcome to Sparrow!");
dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm()); dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm());
dialogPane.setPrefWidth(600); dialogPane.setPrefWidth(600);
dialogPane.setPrefHeight(450); dialogPane.setPrefHeight(480);
Image image = new Image("image/sparrow-small.png", 50, 50, false, false); Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
if (!image.isError()) { if (!image.isError()) {

3
src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java
View file

@ -199,8 +199,11 @@ public class WalletForm {
@Subscribe @Subscribe
public void newBlock(NewBlockEvent event) { public void newBlock(NewBlockEvent event) {
//Check if wallet is valid to avoid saving wallets in initial setup
if(wallet.isValid()) {
updateWallet(wallet.copy(), event.getHeight()); updateWallet(wallet.copy(), event.getHeight());
} }
}
@Subscribe @Subscribe
public void connected(ConnectionEvent event) { public void connected(ConnectionEvent event) {

2
src/main/resources/com/sparrowwallet/sparrow/preferences/general.fxml
View file

@ -63,7 +63,7 @@
<UnlabeledToggleSwitch fx:id="groupByAddress" /> <UnlabeledToggleSwitch fx:id="groupByAddress" />
<HelpLabel helpText="Group UTXOs by address when sending to improve privacy by only sending from an address once"/> <HelpLabel helpText="Group UTXOs by address when sending to improve privacy by only sending from an address once"/>
</Field> </Field>
<Field text="Include mempool change:"> <Field text="Use mempool change:">
<UnlabeledToggleSwitch fx:id="includeMempoolChange" /> <UnlabeledToggleSwitch fx:id="includeMempoolChange" />
<HelpLabel helpText="Allow a wallet to spend UTXOs that are still in the mempool where all their inputs are from that wallet"/> <HelpLabel helpText="Allow a wallet to spend UTXOs that are still in the mempool where all their inputs are from that wallet"/>
</Field> </Field>

2
src/main/resources/com/sparrowwallet/sparrow/wallet/send.fxml
View file

@ -63,7 +63,7 @@
</Form> </Form>
<Form GridPane.columnIndex="0" GridPane.rowIndex="1"> <Form GridPane.columnIndex="0" GridPane.rowIndex="1">
<Fieldset inputGrow="SOMETIMES" text="Fee"> <Fieldset inputGrow="SOMETIMES" text="Fee">
<Field text="Block Target:"> <Field text="Block target:">
<Slider fx:id="targetBlocks" snapToTicks="true" showTickLabels="true" showTickMarks="true" /> <Slider fx:id="targetBlocks" snapToTicks="true" showTickLabels="true" showTickMarks="true" />
</Field> </Field>
<Field fx:id="feeRateField" text="Rate:"> <Field fx:id="feeRateField" text="Rate:">