From 6057c20406e431fa2ae2a6255c0465d866a5f63e Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 10 Jun 2016 21:22:59 +0200 Subject: [PATCH] dont blur at stresstests, dont animate spinners --- gui/src/main/java/io/bitsquare/gui/main/MainView.java | 9 ++++++--- .../main/java/io/bitsquare/gui/main/MainViewModel.java | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainView.java b/gui/src/main/java/io/bitsquare/gui/main/MainView.java index b7b2b0c043..688a77ed58 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainView.java @@ -19,6 +19,7 @@ package io.bitsquare.gui.main; import io.bitsquare.BitsquareException; import io.bitsquare.app.BitsquareApp; +import io.bitsquare.app.DevFlags; import io.bitsquare.btc.pricefeed.PriceFeed; import io.bitsquare.common.UserThread; import io.bitsquare.common.util.Tuple2; @@ -67,11 +68,13 @@ public class MainView extends InitializableView { } public static void blurLight() { - transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 5); + if (!DevFlags.STRESS_TEST_MODE) + transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 5); } public static void blurUltraLight() { - transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 2); + if (!DevFlags.STRESS_TEST_MODE) + transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 2); } public static void darken() { @@ -335,7 +338,7 @@ public class MainView extends InitializableView { }; model.walletServiceErrorMsg.addListener(walletServiceErrorMsgListener); - btcSyncIndicator = new ProgressBar(-1); + btcSyncIndicator = new ProgressBar(); btcSyncIndicator.setPrefWidth(120); btcSyncIndicator.progressProperty().bind(model.btcSyncProgress); diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java index cda3c1c983..394807cd77 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -110,7 +110,7 @@ public class MainViewModel implements ViewModel { // BTC network 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 btcSplashSyncIconId = new SimpleStringProperty(); final StringProperty marketPrice = new SimpleStringProperty("N/A"); @@ -126,7 +126,7 @@ public class MainViewModel implements ViewModel { // P2P network final StringProperty p2PNetworkInfo = new SimpleStringProperty(); private MonadicBinding 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 p2PNetworkIconId = new SimpleStringProperty(); final BooleanProperty bootstrapComplete = new SimpleBooleanProperty();