Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-08 22:52:18 -04:00
Code Issues Projects Releases Packages Wiki Activity

dont blur at stresstests, dont animate spinners

Browse source
This commit is contained in:
Manfred Karrer 2016-06-10 21:22:59 +02:00
parent 03171abd28
commit 6057c20406
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gui/src/main/java/io/bitsquare/gui/main/MainView.java
View file

@ -19,6 +19,7 @@ package io.bitsquare.gui.main;
import io.bitsquare.BitsquareException; import io.bitsquare.BitsquareException;
import io.bitsquare.app.BitsquareApp; import io.bitsquare.app.BitsquareApp;
import io.bitsquare.app.DevFlags;
import io.bitsquare.btc.pricefeed.PriceFeed; import io.bitsquare.btc.pricefeed.PriceFeed;
import io.bitsquare.common.UserThread; import io.bitsquare.common.UserThread;
import io.bitsquare.common.util.Tuple2; import io.bitsquare.common.util.Tuple2;
@ -67,10 +68,12 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
} }
public static void blurLight() { public static void blurLight() {
if (!DevFlags.STRESS_TEST_MODE)
transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 5); transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 5);
} }
public static void blurUltraLight() { public static void blurUltraLight() {
if (!DevFlags.STRESS_TEST_MODE)
transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 2); transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 2);
} }
@ -335,7 +338,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
}; };
model.walletServiceErrorMsg.addListener(walletServiceErrorMsgListener); model.walletServiceErrorMsg.addListener(walletServiceErrorMsgListener);
btcSyncIndicator = new ProgressBar(-1); btcSyncIndicator = new ProgressBar();
btcSyncIndicator.setPrefWidth(120); btcSyncIndicator.setPrefWidth(120);
btcSyncIndicator.progressProperty().bind(model.btcSyncProgress); btcSyncIndicator.progressProperty().bind(model.btcSyncProgress);

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

@ -110,7 +110,7 @@ public class MainViewModel implements ViewModel {
// BTC network // BTC network
final StringProperty btcInfo = new SimpleStringProperty("Initializing"); final StringProperty btcInfo = new SimpleStringProperty("Initializing");
final DoubleProperty btcSyncProgress = new SimpleDoubleProperty(-1); final DoubleProperty btcSyncProgress = new SimpleDoubleProperty(DevFlags.STRESS_TEST_MODE ? 0 : -1);
final StringProperty walletServiceErrorMsg = new SimpleStringProperty(); final StringProperty walletServiceErrorMsg = new SimpleStringProperty();
final StringProperty btcSplashSyncIconId = new SimpleStringProperty(); final StringProperty btcSplashSyncIconId = new SimpleStringProperty();
final StringProperty marketPrice = new SimpleStringProperty("N/A"); final StringProperty marketPrice = new SimpleStringProperty("N/A");
@ -126,7 +126,7 @@ public class MainViewModel implements ViewModel {
// P2P network // P2P network
final StringProperty p2PNetworkInfo = new SimpleStringProperty(); final StringProperty p2PNetworkInfo = new SimpleStringProperty();
private MonadicBinding<String> p2PNetworkInfoBinding; private MonadicBinding<String> p2PNetworkInfoBinding;
final DoubleProperty splashP2PNetworkProgress = new SimpleDoubleProperty(-1); final DoubleProperty splashP2PNetworkProgress = new SimpleDoubleProperty(DevFlags.STRESS_TEST_MODE ? 0 : -1);
final StringProperty p2pNetworkWarnMsg = new SimpleStringProperty(); final StringProperty p2pNetworkWarnMsg = new SimpleStringProperty();
final StringProperty p2PNetworkIconId = new SimpleStringProperty(); final StringProperty p2PNetworkIconId = new SimpleStringProperty();
final BooleanProperty bootstrapComplete = new SimpleBooleanProperty(); final BooleanProperty bootstrapComplete = new SimpleBooleanProperty();