laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-08-09 16:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:sparrowwallet/sparrow into master

Browse Source
This commit is contained in:
Craig Raw
2020-08-28 19:39:34 +02:00
parent ddcabf721e 7eb4b9c61d
commit ffce18919f
8 changed files with 185 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreImportPane.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
private void createEnterMnemonicButton() {
enterMnemonicButton = new SplitMenuButton();
enterMnemonicButton.setAlignment(Pos.CENTER_RIGHT);
enterMnemonicButton.setText("Set Words Length");
enterMnemonicButton.setText("Set Words Size");
enterMnemonicButton.setOnAction(event -> {
enterMnemonic(24);
});
src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java
+4 -3
View File
@@ -15,8 +15,8 @@ import org.controlsfx.control.ToggleSwitch;
public class WelcomeDialog extends Dialog<Mode> {
private static final String[] ELECTRUM_SERVERS = new String[]{
"ElectrumX (Recommended)", "https://github.com/spesmilo/electrumx",
"electrs", "https://github.com/romanz/electrs",
"esplora-electrs", "https://github.com/Blockstream/electrs"};
"electrs (Experimental)", "https://github.com/romanz/electrs",
"esplora-electrs (Experimental)", "https://github.com/Blockstream/electrs"};
private final HostServices hostServices;
@@ -71,7 +71,8 @@ public class WelcomeDialog extends Dialog<Mode> {
}
private HyperlinkLabel createBulletedLink(String name, String url) {
HyperlinkLabel label = new HyperlinkLabel(" \u2022 [" + name + "]");
String[] nameParts = name.split(" ");
HyperlinkLabel label = new HyperlinkLabel(" \u2022 [" + nameParts[0] + "] " + (nameParts.length > 1 ? nameParts[1] : ""));
label.setOnAction(event -> {
hostServices.showDocument(url);
});
src/main/java/com/sparrowwallet/sparrow/io/Hwi.java
+1 -1
View File
@@ -221,7 +221,7 @@ public class Hwi {
inputStream = Hwi.class.getResourceAsStream("/external/windows/hwi.exe");
tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null);
} else {
inputStream = Hwi.class.getResourceAsStream("/external/" + platform.getPlatformId().toLowerCase() + "/hwi");
inputStream = Hwi.class.getResourceAsStream("/external/linux/hwi");
tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null, PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
}