Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-25 07:10:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixed unlimed crypto key issues

Browse source
This commit is contained in:
Manfred Karrer 2015-12-28 19:42:25 +01:00
parent 7d2935b98f
commit 390a7cbacc
5 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java
View file

@ -35,7 +35,6 @@ import java.nio.file.Paths;
import static io.bitsquare.app.BitsquareEnvironment.*;
import static java.util.Arrays.asList;
//TODO clean up
public class BitsquareAppMain extends BitsquareExecutable {
private static final Logger log = LoggerFactory.getLogger(BitsquareAppMain.class);

26
gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
View file

@ -91,7 +91,7 @@ class MainViewModel implements ViewModel {
final StringProperty blockchainSyncIconId = new SimpleStringProperty();
final StringProperty availableBalance = new SimpleStringProperty();
final StringProperty lockedBalance = new SimpleStringProperty();
private final StringProperty numBTCPeers = new SimpleStringProperty();
private final StringProperty numBTCPeersAsString = new SimpleStringProperty();
// P2P network
final StringProperty splashP2PNetworkInfo = new SimpleStringProperty();
@ -116,6 +116,7 @@ class MainViewModel implements ViewModel {
private Timer lostP2PConnectionTimeoutTimer;
private MonadicBinding<Boolean> allServicesDone;
private User user;
private int numBTCPeers = 0;
//private Timer lostBTCConnectionTimeoutTimer;
@ -249,7 +250,11 @@ class MainViewModel implements ViewModel {
walletService.numPeersProperty().addListener((observable, oldValue, newValue) -> {
log.debug("Bitcoin peers " + newValue);
numBTCPeers.set(String.valueOf(newValue) + " peers");
numBTCPeers = (int) newValue;
numBTCPeersAsString.set(String.valueOf(newValue) + " peers");
if (blockchainSyncProgress.get() >= 1 && numBTCPeers > 1)
blockchainSyncInfoFooter.set("Bitcoin network: Peers: " + numBTCPeers);
/* if ((int) newValue < 1) {
if (lostBTCConnectionTimeoutTimer != null)
lostBTCConnectionTimeoutTimer.cancel();
@ -364,7 +369,7 @@ class MainViewModel implements ViewModel {
new Popup().headLine("USER AGREEMENT")
.message(text)
.actionButtonText("I agree")
.closeButtonText("Quit")
.closeButtonText("I disagree and quit")
.onAction(() -> preferences.setTacAccepted(true))
.onClose(() -> BitsquareApp.shutDownHandler.run())
.show();
@ -577,20 +582,25 @@ class MainViewModel implements ViewModel {
private void setBitcoinNetworkSyncProgress(double value) {
blockchainSyncProgress.set(value);
String nrOfPeers = "";
if (numBTCPeers > 1)
nrOfPeers = ", Peers: " + numBTCPeers;
if (value >= 1) {
stopBlockchainSyncTimeout();
blockchainSyncInfo.set("Blockchain synchronization complete.");
blockchainSyncInfo.set("Blockchain synchronization complete." + nrOfPeers);
blockchainSyncIconId.set("image-connection-synced");
} else if (value > 0.0) {
// We stop as soon the download started the timeout
stopBlockchainSyncTimeout();
blockchainSyncInfo.set("Synchronizing blockchain: " + formatter.formatToPercent(value));
blockchainSyncInfoFooter.set("Synchronizing: " + formatter.formatToPercent(value));
blockchainSyncInfo.set("Synchronizing blockchain: " + formatter.formatToPercent(value) + nrOfPeers);
blockchainSyncInfoFooter.set("Synchronizing: " + formatter.formatToPercent(value) + nrOfPeers);
} else {
blockchainSyncInfo.set("Connecting to the bitcoin network...");
blockchainSyncInfoFooter.set("Connecting...");
blockchainSyncInfo.set("Connecting to the bitcoin network..." + nrOfPeers);
blockchainSyncInfoFooter.set("Connecting..." + nrOfPeers);
}
}

5
gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java
View file

@ -55,9 +55,6 @@ public class ImageUtil {
}
public static boolean isRetina() {
// Latest JDK renamed getMaxPixelScale to getMaxRenderScale
// return ((QuantumToolkit) QuantumToolkit.getToolkit()).getMaxRenderScale() > 1.9f;
return ((QuantumToolkit) QuantumToolkit.getToolkit()).getMaxPixelScale() > 1.9f;
return ((QuantumToolkit) QuantumToolkit.getToolkit()).getMaxRenderScale() > 1.9f;
}
}