diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java index 74b7919af2..cd365586f0 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java @@ -438,7 +438,7 @@ public class OfferBookChartView extends ActivatableViewAndModel(); GridPane.setRowIndex(tableView, gridRow); - GridPane.setMargin(tableView, new Insets(20, -10, -10, -10)); + GridPane.setMargin(tableView, new Insets(-10, -15, -10, -15)); GridPane.setVgrow(tableView, Priority.ALWAYS); GridPane.setHgrow(tableView, Priority.ALWAYS); root.getChildren().add(tableView); - Label placeholder = new Label("Currently there is no data available"); + Label placeholder = new Label(Res.get("table.placeholder.noData")); placeholder.setWrapText(true); tableView.setPlaceholder(placeholder); @@ -116,10 +111,15 @@ public class SpreadView extends ActivatableViewAndModel item.numberOfOffers).sum() + ")"); - numberOfBuyOffersColumn.setText("Buy BTC (" + sortedList.stream().mapToInt(item -> item.numberOfBuyOffers).sum() + ")"); - numberOfSellOffersColumn.setText("Sell BTC (" + sortedList.stream().mapToInt(item -> item.numberOfSellOffers).sum() + ")"); - totalAmountColumn.setText("Total BTC (" + formatter.formatCoin(Coin.valueOf(sortedList.stream().mapToLong(item -> item.totalAmount.value).sum())) + ")"); + int numberOfOffers = sortedList.stream().mapToInt(item -> item.numberOfOffers).sum(); + int numberOfBuyOffers = sortedList.stream().mapToInt(item -> item.numberOfBuyOffers).sum(); + int numberOfSellOffers = sortedList.stream().mapToInt(item -> item.numberOfSellOffers).sum(); + String total = formatter.formatCoin(Coin.valueOf(sortedList.stream().mapToLong(item -> item.totalAmount.value).sum())); + + numberOfOffersColumn.setText(Res.get("market.spread.numberOfOffersColumn", numberOfOffers)); + numberOfBuyOffersColumn.setText(Res.get("market.spread.numberOfBuyOffersColumn", numberOfBuyOffers)); + numberOfSellOffersColumn.setText(Res.get("market.spread.numberOfSellOffersColumn", numberOfSellOffers)); + totalAmountColumn.setText(Res.get("market.spread.totalAmountColumn", total)); } @@ -128,9 +128,9 @@ public class SpreadView extends ActivatableViewAndModel getCurrencyColumn() { - TableColumn column = new TableColumn("Currency") { + TableColumn column = new TableColumn(Res.get("table.column.currency.header")) { { - setMinWidth(160); //110 + setMinWidth(160); } }; column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue())); @@ -184,7 +184,7 @@ public class SpreadView extends ActivatableViewAndModel getNumberOfBuyOffersColumn() { - TableColumn column = new TableColumn("Buy offers") { + TableColumn column = new TableColumn() { { setMinWidth(100); } @@ -212,7 +212,7 @@ public class SpreadView extends ActivatableViewAndModel getNumberOfSellOffersColumn() { - TableColumn column = new TableColumn("Sell offers") { + TableColumn column = new TableColumn() { { setMinWidth(100); } @@ -240,9 +240,9 @@ public class SpreadView extends ActivatableViewAndModel getTotalAmountColumn() { - TableColumn column = new TableColumn("Total amount") { + TableColumn column = new TableColumn() { { - setMinWidth(140); //170 + setMinWidth(140); } }; column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue())); @@ -268,9 +268,9 @@ public class SpreadView extends ActivatableViewAndModel getSpreadColumn() { - TableColumn column = new TableColumn("Spread") { + TableColumn column = new TableColumn(Res.get("market.spread.spreadColumn")) { { - setMinWidth(110); //130 + setMinWidth(110); } }; column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue())); diff --git a/gui/src/main/resources/i18n/displayStrings.properties b/gui/src/main/resources/i18n/displayStrings.properties index c9aee1a75d..86fddf1495 100644 --- a/gui/src/main/resources/i18n/displayStrings.properties +++ b/gui/src/main/resources/i18n/displayStrings.properties @@ -80,6 +80,11 @@ market.offerBook.sellOfferButton=I want to sell {0} (buy {1}) # Market.Spread #################################################################### +market.spread.numberOfOffersColumn=All offers ({0}) +market.spread.numberOfBuyOffersColumn=Buy BTC ({0}) +market.spread.numberOfSellOffersColumn=Sell BTC ({0}) +market.spread.totalAmountColumn=Total BTC ({0}) +market.spread.spreadColumn=Spread #################################################################### # Market.Trades @@ -158,10 +163,12 @@ list.currency.editList=Edit currency list label.currency=Currency: -table.placeholder=Currently there are no {0} available +table.placeholder.noItems=Currently there are no {0} available +table.placeholder.noData=Currently there is no data available table.column.price.header=Price in {0} table.column.amount.header=Amount in {0} table.column.sum.header=Sum in {0} +table.column.currency.header=Currency chart.yAxis.amount.label=Amount in {0}