mirror of
https://github.com/sparrowwallet/sparrow.git
synced 2024-11-04 21:36:45 +00:00
various bwt related tweaks
This commit is contained in:
parent
546ccd66b3
commit
826162ba9f
8 changed files with 19 additions and 11 deletions
|
@ -22,4 +22,8 @@ public class AboutController {
|
||||||
public void close(ActionEvent event) {
|
public void close(ActionEvent event) {
|
||||||
stage.close();
|
stage.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void openDonate(ActionEvent event) {
|
||||||
|
AppServices.get().getApplication().getHostServices().showDocument("https://sparrowwallet.com/donate");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,7 @@ public class WelcomeDialog extends Dialog<Mode> {
|
||||||
|
|
||||||
setTitle("Welcome to Sparrow");
|
setTitle("Welcome to Sparrow");
|
||||||
dialogPane.setHeaderText("Welcome to Sparrow!");
|
dialogPane.setHeaderText("Welcome to Sparrow!");
|
||||||
|
dialogPane.getStylesheets().add(AppServices.class.getResource("app.css").toExternalForm());
|
||||||
dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
|
dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
|
||||||
AppServices.setStageIcon(dialogPane.getScene().getWindow());
|
AppServices.setStageIcon(dialogPane.getScene().getWindow());
|
||||||
dialogPane.setPrefWidth(600);
|
dialogPane.setPrefWidth(600);
|
||||||
|
|
|
@ -86,8 +86,7 @@ public class Bwt {
|
||||||
bwtConfig.descriptors = outputDescriptors;
|
bwtConfig.descriptors = outputDescriptors;
|
||||||
bwtConfig.rescanSince = (rescanSince == null || rescanSince < 0 ? "now" : rescanSince);
|
bwtConfig.rescanSince = (rescanSince == null || rescanSince < 0 ? "now" : rescanSince);
|
||||||
bwtConfig.forceRescan = forceRescan;
|
bwtConfig.forceRescan = forceRescan;
|
||||||
//bwtConfig.initialImportSize = IMPORT_BATCH_SIZE;
|
bwtConfig.gapLimit = gapLimit;
|
||||||
bwtConfig.gapLimit = IMPORT_BATCH_SIZE;
|
|
||||||
} else {
|
} else {
|
||||||
bwtConfig.requireAddresses = false;
|
bwtConfig.requireAddresses = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -135,12 +135,15 @@ public class ServerPreferencesController extends PreferencesDetailController {
|
||||||
coreForm.visibleProperty().bind(electrumForm.visibleProperty().not());
|
coreForm.visibleProperty().bind(electrumForm.visibleProperty().not());
|
||||||
serverTypeToggleGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
|
serverTypeToggleGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
|
||||||
if(serverTypeToggleGroup.getSelectedToggle() != null) {
|
if(serverTypeToggleGroup.getSelectedToggle() != null) {
|
||||||
|
ServerType existingType = config.getServerType();
|
||||||
ServerType serverType = (ServerType)newValue.getUserData();
|
ServerType serverType = (ServerType)newValue.getUserData();
|
||||||
electrumForm.setVisible(serverType == ServerType.ELECTRUM_SERVER);
|
electrumForm.setVisible(serverType == ServerType.ELECTRUM_SERVER);
|
||||||
config.setServerType(serverType);
|
config.setServerType(serverType);
|
||||||
testConnection.setGraphic(getGlyph(FontAwesome5.Glyph.QUESTION_CIRCLE, ""));
|
testConnection.setGraphic(getGlyph(FontAwesome5.Glyph.QUESTION_CIRCLE, ""));
|
||||||
testResults.clear();
|
testResults.clear();
|
||||||
EventManager.get().post(new ServerTypeChangedEvent(serverType));
|
if(existingType != serverType) {
|
||||||
|
EventManager.get().post(new ServerTypeChangedEvent(serverType));
|
||||||
|
}
|
||||||
} else if(oldValue != null) {
|
} else if(oldValue != null) {
|
||||||
oldValue.setSelected(true);
|
oldValue.setSelected(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
<?import javafx.scene.image.ImageView?>
|
<?import javafx.scene.image.ImageView?>
|
||||||
<?import javafx.scene.image.Image?>
|
<?import javafx.scene.image.Image?>
|
||||||
<StackPane prefHeight="420.0" prefWidth="600.0" stylesheets="@about.css" fx:controller="com.sparrowwallet.sparrow.AboutController" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml">
|
<StackPane prefHeight="420.0" prefWidth="600.0" stylesheets="@about.css, @general.css" fx:controller="com.sparrowwallet.sparrow.AboutController" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml">
|
||||||
<VBox spacing="20">
|
<VBox spacing="20">
|
||||||
<HBox styleClass="title-area">
|
<HBox styleClass="title-area">
|
||||||
<HBox alignment="CENTER_LEFT">
|
<HBox alignment="CENTER_LEFT">
|
||||||
|
@ -21,8 +21,9 @@
|
||||||
</HBox>
|
</HBox>
|
||||||
<VBox spacing="10" styleClass="content-area">
|
<VBox spacing="10" styleClass="content-area">
|
||||||
<Label text="Sparrow is a Bitcoin wallet with the goal of providing greater transparency and usability on the path to full financial self sovereignty. It attempts to provide all of the detail about your wallet setup, transactions and UTXOs so that you can transact will a full understanding of your money." wrapText="true" />
|
<Label text="Sparrow is a Bitcoin wallet with the goal of providing greater transparency and usability on the path to full financial self sovereignty. It attempts to provide all of the detail about your wallet setup, transactions and UTXOs so that you can transact will a full understanding of your money." wrapText="true" />
|
||||||
<Label text="Sparrow can operate in both an online and offline mode. In the online mode it connects to your Electrum server to display transaction history. In the offline mode it is useful as a transaction editor and as an airgapped multisig coordinator." wrapText="true" />
|
<Label text="Sparrow can operate in both an online and offline mode. In the online mode it connects to your Bitcoin Core node or Electrum server to display transaction history. In the offline mode it is useful as a transaction editor and as an airgapped multisig coordinator." wrapText="true" />
|
||||||
<Label text="For privacy and security reasons it is not recommended to use a public Electrum server. Install an Electrum server that connects to your full node to index the blockchain and provide full privacy." wrapText="true" />
|
<Label text="Connecting Sparrow to your Bitcoin Core node ensures your privacy, while connecting Sparrow to your own Electrum server ensures wallets load quicker, you have access to a full blockchain explorer, and your public keys are always encrypted on disk. " wrapText="true" />
|
||||||
|
<HBox><Label text="If you find Sparrow useful, consider donating at "/><Hyperlink text="https://sparrowwallet.com/donate" onAction="#openDonate"/></HBox>
|
||||||
</VBox>
|
</VBox>
|
||||||
<HBox styleClass="button-area" alignment="BOTTOM_RIGHT" VBox.vgrow="SOMETIMES">
|
<HBox styleClass="button-area" alignment="BOTTOM_RIGHT" VBox.vgrow="SOMETIMES">
|
||||||
<Button text="Done" onAction="#close" />
|
<Button text="Done" onAction="#close" />
|
||||||
|
|
|
@ -29,3 +29,8 @@
|
||||||
-fx-padding: 0 0 0 8;
|
-fx-padding: 0 0 0 8;
|
||||||
-fx-spacing: 10;
|
-fx-spacing: 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.core-server.toggle-switch:selected .thumb-area {
|
||||||
|
-fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)), linear-gradient(to bottom, derive(#50a14f, 30%), #50a14f);
|
||||||
|
-fx-background-insets: 0, 1;
|
||||||
|
}
|
||||||
|
|
|
@ -159,8 +159,3 @@
|
||||||
.root .header-panel {
|
.root .header-panel {
|
||||||
-fx-background-color: -fx-box-border, derive(-fx-background, 10%);
|
-fx-background-color: -fx-box-border, derive(-fx-background, 10%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.core-server.toggle-switch:selected .thumb-area {
|
|
||||||
-fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)), linear-gradient(to bottom, derive(#50a14f, 30%), #50a14f);
|
|
||||||
-fx-background-insets: 0, 1;
|
|
||||||
}
|
|
Binary file not shown.
Loading…
Reference in a new issue