sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-23 20:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve script type descriptions and help text

Browse source
This commit is contained in:
Craig Raw 2021-02-17 10:24:21 +02:00
parent 5abea8c594
commit ae2db6e204
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drongo

@ -1 +1 @@
Subproject commit 3882a4b4bd9a738329bfffcaff72b477bb3a2d2f
Subproject commit 79216fac912724e7b06b3ffe15e38ddf005e665f

13
src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java
View file

@ -24,6 +24,7 @@ import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
import javafx.scene.control.*;
import javafx.scene.layout.StackPane;
import javafx.util.StringConverter;
import org.controlsfx.control.RangeSlider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -105,6 +106,18 @@ public class SettingsController extends WalletFormController implements Initiali
}
});
scriptType.setConverter(new StringConverter<>() {
@Override
public String toString(ScriptType scriptType) {
return scriptType.getDescription();
}
@Override
public ScriptType fromString(String string) {
return ScriptType.fromDescriptor(string);
}
});
scriptType.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, scriptType) -> {
if(scriptType != null) {
walletForm.getWallet().setScriptType(scriptType);

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

@ -57,7 +57,7 @@
</FXCollections>
</items>
</ComboBox>
<HelpLabel helpText="P2WPKH and P2WSH are Native Segwit types and are usually the best choice.\nP2SH-P2WPKH and P2SH-P2WSH are Wrapped Segwit types and a good choice for the widest compatibility.\nP2PKH and P2SH are Legacy types and should be avoided, unless configuring an old wallet." />
<HelpLabel helpText="Native Segwit types are the default and are usually the best choice.\nNested Segwit types are a good choice for the widest compatibility with older wallets.\nLegacy types should be avoided, unless configuring an old wallet." />
</Field>
</Fieldset>
</Form>