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

dont show status server banner (but show height in tooltip)

Browse source
This commit is contained in:
Craig Raw 2020-08-30 13:47:31 +02:00
parent 546076ea48
commit 4d7d51f3f8
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/sparrowwallet/sparrow/AppController.java
View file

@ -255,7 +255,9 @@ public class AppController implements Initializable {
}); });
onlineProperty.bindBidirectional(serverToggle.selectedProperty()); onlineProperty.bindBidirectional(serverToggle.selectedProperty());
onlineProperty().addListener((observable, oldValue, newValue) -> serverToggle.setTooltip(new Tooltip(newValue ? "Connected to " + Config.get().getElectrumServer() : "Disconnected"))); onlineProperty().addListener((observable, oldValue, newValue) -> {
Platform.runLater(this::setServerToggleTooltip);
});
Config config = Config.get(); Config config = Config.get();
connectionService = createConnectionService(); connectionService = createConnectionService();
@ -670,6 +672,10 @@ public class AppController implements Initializable {
return FileType.JSON.equals(fileType) || FileType.BINARY.equals(fileType); return FileType.JSON.equals(fileType) || FileType.BINARY.equals(fileType);
} }
private void setServerToggleTooltip() {
serverToggle.setTooltip(new Tooltip(isOnline() ? "Connected to " + Config.get().getElectrumServer() + (getCurrentBlockHeight() != null ? " at height " + getCurrentBlockHeight() : "") : "Disconnected"));
}
public void newWallet(ActionEvent event) { public void newWallet(ActionEvent event) {
WalletNameDialog dlg = new WalletNameDialog(); WalletNameDialog dlg = new WalletNameDialog();
Optional<String> walletName = dlg.showAndWait(); Optional<String> walletName = dlg.showAndWait();
@ -1172,7 +1178,7 @@ public class AppController implements Initializable {
currentBlockHeight = event.getBlockHeight(); currentBlockHeight = event.getBlockHeight();
targetBlockFeeRates = event.getTargetBlockFeeRates(); targetBlockFeeRates = event.getTargetBlockFeeRates();
String banner = event.getServerBanner(); String banner = event.getServerBanner();
String status = "Connected: " + (banner == null ? "Server" : banner.split("\\R", 2)[0]) + " at height " + event.getBlockHeight(); String status = "Connected to " + Config.get().getElectrumServer() + " at height " + event.getBlockHeight();
EventManager.get().post(new StatusEvent(status)); EventManager.get().post(new StatusEvent(status));
} }
@ -1186,6 +1192,7 @@ public class AppController implements Initializable {
@Subscribe @Subscribe
public void newBlock(NewBlockEvent event) { public void newBlock(NewBlockEvent event) {
currentBlockHeight = event.getHeight(); currentBlockHeight = event.getHeight();
setServerToggleTooltip();
String status = "Updating to new block height " + event.getHeight(); String status = "Updating to new block height " + event.getHeight();
EventManager.get().post(new StatusEvent(status)); EventManager.get().post(new StatusEvent(status));
} }