mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change layout of market price icons and label text for market price.

Browse source
This commit is contained in:
Manfred Karrer 2017-03-20 01:14:50 -05:00
parent 6790eec935
commit 1325def899
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/resources/i18n/displayStrings.properties
View file

@ -205,7 +205,7 @@ mainView.menu.settings=Settings
mainView.menu.account=Account mainView.menu.account=Account
mainView.menu.dao=DAO 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=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.marketPrice.tooltip.altcoinExtra=If the altcoin is not available at Poloniex we use https://coinmarketcap.com
mainView.balance.available=Available balance mainView.balance.available=Available balance

26
gui/src/main/java/io/bisq/gui/main/MainView.java
View file

@ -22,7 +22,6 @@ import io.bisq.common.app.DevEnv;
import io.bisq.common.app.Version; import io.bisq.common.app.Version;
import io.bisq.common.locale.Res; import io.bisq.common.locale.Res;
import io.bisq.common.util.Tuple2; import io.bisq.common.util.Tuple2;
import io.bisq.common.util.Tuple3;
import io.bisq.core.app.AppOptionKeys; import io.bisq.core.app.AppOptionKeys;
import io.bisq.core.app.BisqEnvironment; import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.exceptions.BisqException; import io.bisq.core.exceptions.BisqException;
@ -145,7 +144,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
}}; }};
Tuple3<ComboBox<PriceFeedComboBoxItem>, Label, VBox> marketPriceBox = getMarketPriceBox(); Tuple2<ComboBox<PriceFeedComboBoxItem>, VBox> marketPriceBox = getMarketPriceBox();
ComboBox<PriceFeedComboBoxItem> priceComboBox = marketPriceBox.first; ComboBox<PriceFeedComboBoxItem> priceComboBox = marketPriceBox.first;
priceComboBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> { priceComboBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
@ -159,7 +158,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
model.selectedPriceFeedComboBoxItemProperty.addListener(selectedPriceFeedItemListener); model.selectedPriceFeedComboBoxItemProperty.addListener(selectedPriceFeedItemListener);
priceComboBox.setItems(model.priceFeedComboBoxItems); 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<TextField, VBox> availableBalanceBox = getBalanceBox(Res.get("mainView.balance.available")); Tuple2<TextField, VBox> availableBalanceBox = getBalanceBox(Res.get("mainView.balance.available"));
@ -171,7 +170,8 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
Tuple2<TextField, VBox> lockedBalanceBox = getBalanceBox(Res.get("mainView.balance.locked")); Tuple2<TextField, VBox> lockedBalanceBox = getBalanceBox(Res.get("mainView.balance.locked"));
lockedBalanceBox.first.textProperty().bind(model.lockedBalance); 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) {{ settingsButton, accountButton, daoButton) {{
setRightAnchor(this, 10d); setRightAnchor(this, 10d);
setTopAnchor(this, 0d); setTopAnchor(this, 0d);
@ -287,7 +287,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
}; };
} }
private Tuple3<ComboBox<PriceFeedComboBoxItem>, Label, VBox> getMarketPriceBox() { private Tuple2<ComboBox<PriceFeedComboBoxItem>, VBox> getMarketPriceBox() {
ComboBox<PriceFeedComboBoxItem> priceComboBox = new ComboBox<>(); ComboBox<PriceFeedComboBoxItem> priceComboBox = new ComboBox<>();
priceComboBox.setVisibleRowCount(20); priceComboBox.setVisibleRowCount(20);
priceComboBox.setMaxWidth(220); priceComboBox.setMaxWidth(220);
@ -299,10 +299,6 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
buttonCell.setId("price-feed-combo"); buttonCell.setId("price-feed-combo");
priceComboBox.setButtonCell(buttonCell); 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(); final ImageView btcAverageIcon = new ImageView();
btcAverageIcon.setId("btcaverage"); btcAverageIcon.setId("btcaverage");
final Button btcAverageIconButton = new Button("", btcAverageIcon); final Button btcAverageIconButton = new Button("", btcAverageIcon);
@ -332,7 +328,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
poloniexIconButton.setPadding(new Insets(-3, 0, -3, 0)); poloniexIconButton.setPadding(new Insets(-3, 0, -3, 0));
poloniexIconButton.setFocusTraversable(false); poloniexIconButton.setFocusTraversable(false);
poloniexIconButton.setStyle("-fx-background-color: transparent;"); 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.setOnAction(e -> GUIUtil.openWebPage("https://poloniex.com"));
poloniexIconButton.setVisible(model.isCryptoCurrencyPriceFeedSelected.get()); poloniexIconButton.setVisible(model.isCryptoCurrencyPriceFeedSelected.get());
poloniexIconButton.setManaged(model.isCryptoCurrencyPriceFeedSelected.get()); poloniexIconButton.setManaged(model.isCryptoCurrencyPriceFeedSelected.get());
@ -348,17 +344,19 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
new Tooltip(res) 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(); HBox hBox2 = new HBox();
hBox2.getChildren().setAll(label, spacer, btcAverageIconButton, poloniexIconButton); hBox2.getChildren().setAll(label, btcAverageIconButton, poloniexIconButton);
VBox vBox = new VBox(); VBox vBox = new VBox();
vBox.setSpacing(3); vBox.setSpacing(3);
vBox.setPadding(new Insets(11, 0, 0, 0)); vBox.setPadding(new Insets(11, 0, 0, 0));
vBox.getChildren().addAll(priceComboBox, hBox2); vBox.getChildren().addAll(priceComboBox, hBox2);
return new Tuple3<>(priceComboBox, label, vBox); return new Tuple2<>(priceComboBox, vBox);
} }
public void setPersistedFilesCorrupted(List<String> persistedFilesCorrupted) { public void setPersistedFilesCorrupted(List<String> persistedFilesCorrupted) {