diff --git a/drongo b/drongo index a38206f1..4d61585e 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit a38206f17cd125044d87eb85bf2cf6dcd055e9a0 +Subproject commit 4d61585e4ce9fb346a44a875de47e9d5ff1cebe2 diff --git a/src/main/java/com/sparrowwallet/sparrow/control/FileWalletKeystoreImportPane.java b/src/main/java/com/sparrowwallet/sparrow/control/FileWalletKeystoreImportPane.java index 642c4194..61aea405 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/FileWalletKeystoreImportPane.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/FileWalletKeystoreImportPane.java @@ -72,6 +72,9 @@ public class FileWalletKeystoreImportPane extends FileImportPane { ComboBox scriptTypeComboBox = new ComboBox<>(FXCollections.observableArrayList(ScriptType.getAddressableScriptTypes(PolicyType.SINGLE))); scriptTypeComboBox.setValue(ScriptType.P2WPKH); + HelpLabel helpLabel = new HelpLabel(); + helpLabel.setHelpText("P2WPKH is a Native Segwit type and is usually the best choice for new wallets.\nP2SH-P2WPKH is a Wrapped Segwit type and is a reasonable choice for the widest compatibility.\nP2PKH is a Legacy type and should be avoided for new wallets.\nFor existing wallets, be sure to choose the type that matches the wallet you are importing."); + Region region = new Region(); HBox.setHgrow(region, Priority.SOMETIMES); @@ -97,7 +100,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane { HBox contentBox = new HBox(); contentBox.setAlignment(Pos.CENTER_RIGHT); contentBox.setSpacing(20); - contentBox.getChildren().addAll(label, scriptTypeComboBox, region, importFileButton); + contentBox.getChildren().addAll(label, scriptTypeComboBox, helpLabel, region, importFileButton); contentBox.setPadding(new Insets(10, 30, 10, 30)); contentBox.setPrefHeight(60); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/HelpLabel.java b/src/main/java/com/sparrowwallet/sparrow/control/HelpLabel.java index 7884a6a0..eef8a6a7 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/HelpLabel.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/HelpLabel.java @@ -5,6 +5,7 @@ import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javafx.scene.control.Label; import javafx.scene.control.Tooltip; +import javafx.util.Duration; import org.controlsfx.glyphfont.Glyph; public class HelpLabel extends Label { @@ -14,6 +15,7 @@ public class HelpLabel extends Label { super("", getHelpGlyph()); tooltip = new Tooltip(); tooltip.textProperty().bind(helpTextProperty()); + tooltip.setShowDuration(Duration.seconds(15)); setTooltip(tooltip); getStyleClass().add("help-label"); } diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/settings.fxml b/src/main/resources/com/sparrowwallet/sparrow/wallet/settings.fxml index a416df3a..3834ac47 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/wallet/settings.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/settings.fxml @@ -13,6 +13,7 @@ +
@@ -40,6 +41,7 @@ + @@ -55,6 +57,7 @@ +