diff --git a/common/src/main/resources/i18n/displayStrings.properties b/common/src/main/resources/i18n/displayStrings.properties index 0803bc4168..d765621025 100644 --- a/common/src/main/resources/i18n/displayStrings.properties +++ b/common/src/main/resources/i18n/displayStrings.properties @@ -205,7 +205,7 @@ mainView.menu.settings=Settings mainView.menu.account=Account mainView.menu.dao=DAO -mainView.marketPrice=Market price ({0}) +mainView.marketPrice.provider=Market price provider: mainView.marketPrice.tooltip=Market price is provided by {0}\n{1}\nLast update: {2} mainView.marketPrice.tooltip.altcoinExtra=If the altcoin is not available at Poloniex we use https://coinmarketcap.com mainView.balance.available=Available balance diff --git a/gui/src/main/java/io/bisq/gui/main/MainView.java b/gui/src/main/java/io/bisq/gui/main/MainView.java index 7b09b0a4c9..8c1f8f5adf 100644 --- a/gui/src/main/java/io/bisq/gui/main/MainView.java +++ b/gui/src/main/java/io/bisq/gui/main/MainView.java @@ -22,7 +22,6 @@ import io.bisq.common.app.DevEnv; import io.bisq.common.app.Version; import io.bisq.common.locale.Res; import io.bisq.common.util.Tuple2; -import io.bisq.common.util.Tuple3; import io.bisq.core.app.AppOptionKeys; import io.bisq.core.app.BisqEnvironment; import io.bisq.core.exceptions.BisqException; @@ -145,7 +144,7 @@ public class MainView extends InitializableView { }}; - Tuple3, Label, VBox> marketPriceBox = getMarketPriceBox(); + Tuple2, VBox> marketPriceBox = getMarketPriceBox(); ComboBox priceComboBox = marketPriceBox.first; priceComboBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> { @@ -159,7 +158,7 @@ public class MainView extends InitializableView { model.selectedPriceFeedComboBoxItemProperty.addListener(selectedPriceFeedItemListener); priceComboBox.setItems(model.priceFeedComboBoxItems); - HBox.setMargin(marketPriceBox.third, new Insets(0, 0, 0, 0)); + HBox.setMargin(marketPriceBox.second, new Insets(0, 0, 0, 0)); Tuple2 availableBalanceBox = getBalanceBox(Res.get("mainView.balance.available")); @@ -171,7 +170,8 @@ public class MainView extends InitializableView { Tuple2 lockedBalanceBox = getBalanceBox(Res.get("mainView.balance.locked")); lockedBalanceBox.first.textProperty().bind(model.lockedBalance); - HBox rightNavPane = new HBox(marketPriceBox.third, availableBalanceBox.second, reservedBalanceBox.second, lockedBalanceBox.second, + HBox rightNavPane = new HBox(marketPriceBox.second, availableBalanceBox.second, + reservedBalanceBox.second, lockedBalanceBox.second, settingsButton, accountButton, daoButton) {{ setRightAnchor(this, 10d); setTopAnchor(this, 0d); @@ -287,7 +287,7 @@ public class MainView extends InitializableView { }; } - private Tuple3, Label, VBox> getMarketPriceBox() { + private Tuple2, VBox> getMarketPriceBox() { ComboBox priceComboBox = new ComboBox<>(); priceComboBox.setVisibleRowCount(20); priceComboBox.setMaxWidth(220); @@ -299,10 +299,6 @@ public class MainView extends InitializableView { buttonCell.setId("price-feed-combo"); priceComboBox.setButtonCell(buttonCell); - Label label = new Label(); - label.setId("nav-balance-label"); - label.setPadding(new Insets(0, 0, 0, 2)); - final ImageView btcAverageIcon = new ImageView(); btcAverageIcon.setId("btcaverage"); final Button btcAverageIconButton = new Button("", btcAverageIcon); @@ -332,7 +328,7 @@ public class MainView extends InitializableView { poloniexIconButton.setPadding(new Insets(-3, 0, -3, 0)); poloniexIconButton.setFocusTraversable(false); poloniexIconButton.setStyle("-fx-background-color: transparent;"); - HBox.setMargin(poloniexIconButton, new Insets(1, 3, 0, 0)); + HBox.setMargin(poloniexIconButton, new Insets(2, 3, 0, 0)); poloniexIconButton.setOnAction(e -> GUIUtil.openWebPage("https://poloniex.com")); poloniexIconButton.setVisible(model.isCryptoCurrencyPriceFeedSelected.get()); poloniexIconButton.setManaged(model.isCryptoCurrencyPriceFeedSelected.get()); @@ -348,17 +344,19 @@ public class MainView extends InitializableView { new Tooltip(res) ); }); - Pane spacer = new Pane(); - HBox.setHgrow(spacer, Priority.ALWAYS); + + Label label = new Label(Res.get("mainView.marketPrice.provider")); + label.setId("nav-balance-label"); + label.setPadding(new Insets(0, 5, 0, 2)); HBox hBox2 = new HBox(); - hBox2.getChildren().setAll(label, spacer, btcAverageIconButton, poloniexIconButton); + hBox2.getChildren().setAll(label, btcAverageIconButton, poloniexIconButton); VBox vBox = new VBox(); vBox.setSpacing(3); vBox.setPadding(new Insets(11, 0, 0, 0)); vBox.getChildren().addAll(priceComboBox, hBox2); - return new Tuple3<>(priceComboBox, label, vBox); + return new Tuple2<>(priceComboBox, vBox); } public void setPersistedFilesCorrupted(List persistedFilesCorrupted) {