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

Locked view - Trade ID column

Browse source
This commit is contained in:
xyzmaker123 2022-03-17 14:38:45 +01:00
parent a5912a8f5e
commit ab5d7dd928
No known key found for this signature in database
GPG key ID: 47689699B7B0AAFC
4 changed files with 44 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1119,7 +1119,7 @@ funds.reserved.noFunds=No funds are reserved in open offers
funds.reserved.reserved=Reserved in local wallet
funds.locked.noFunds=No funds are locked in trades
funds.locked.locked=Locked in multisig for trade with ID: {0}
funds.locked.locked=Locked in multisig
funds.tx.direction.sentTo=Sent to:
funds.tx.direction.receivedWith=Received with:

2
desktop/src/main/java/bisq/desktop/main/funds/locked/LockedListItem.java
View file

@ -112,7 +112,7 @@ class LockedListItem implements FilterableListItem {
public String getDetails() {
return trade != null ?
Res.get("funds.locked.locked", trade.getShortId()) :
Res.get("funds.locked.locked") :
Res.get("shared.noDetailsAvailable");
}

5
desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.fxml
View file

@ -35,8 +35,9 @@
<TableView fx:id="tableView" VBox.vgrow="ALWAYS">
<columns>
<TableColumn fx:id="dateColumn" minWidth="180" maxWidth="180"/>
<TableColumn fx:id="detailsColumn" minWidth="320"/>
<TableColumn fx:id="addressColumn" minWidth="320"/>
<TableColumn fx:id="tradeIdColumn" minWidth="280"/>
<TableColumn fx:id="detailsColumn" minWidth="180"/>
<TableColumn fx:id="addressColumn" minWidth="280"/>
<TableColumn fx:id="balanceColumn" minWidth="110"/>
</columns>
</TableView>

50
desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.java
View file

@ -90,7 +90,7 @@ public class LockedView extends ActivatableView<VBox, Void> {
@FXML
TableView<LockedListItem> tableView;
@FXML
TableColumn<LockedListItem, LockedListItem> dateColumn, detailsColumn, addressColumn, balanceColumn;
TableColumn<LockedListItem, LockedListItem> dateColumn, tradeIdColumn, detailsColumn, addressColumn, balanceColumn;
@FXML
Label numItems;
@FXML
@ -138,6 +138,7 @@ public class LockedView extends ActivatableView<VBox, Void> {
public void initialize() {
filterBox.initialize(filteredList, tableView);
dateColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.dateTime")));
tradeIdColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.tradeId")));
detailsColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.details")));
addressColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.address")));
balanceColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.balanceWithCur", Res.getBaseCurrencyCode())));
@ -145,13 +146,15 @@ public class LockedView extends ActivatableView<VBox, Void> {
tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
tableView.setPlaceholder(new AutoTooltipLabel(Res.get("funds.locked.noFunds")));
setTradeIdColumnCellFactory();
setDateColumnCellFactory();
setDetailsColumnCellFactory();
setAddressColumnCellFactory();
setBalanceColumnCellFactory();
addressColumn.setComparator(Comparator.comparing(LockedListItem::getAddressString));
detailsColumn.setComparator(Comparator.comparing(o -> o.getTrade().getId()));
tradeIdColumn.setComparator(Comparator.comparing(o -> o.getTrade().getId()));
detailsColumn.setComparator(Comparator.comparing(o -> o.getDetails()));
balanceColumn.setComparator(Comparator.comparing(LockedListItem::getBalance));
dateColumn.setComparator(Comparator.comparing(o -> getTradable(o).map(Tradable::getDate).orElse(new Date(0))));
tableView.getSortOrder().add(dateColumn);
@ -196,9 +199,10 @@ public class LockedView extends ActivatableView<VBox, Void> {
CSVEntryConverter<LockedListItem> contentConverter = item -> {
String[] columns = new String[reportColumns];
columns[0] = item.getDateString();
columns[1] = item.getDetails();
columns[2] = item.getAddressString();
columns[3] = item.getBalanceString();
columns[1] = item.getTrade().getId();
columns[2] = item.getDetails();
columns[3] = item.getAddressString();
columns[4] = item.getBalanceString();
return columns;
};
@ -302,9 +306,9 @@ public class LockedView extends ActivatableView<VBox, Void> {
});
}
private void setDetailsColumnCellFactory() {
detailsColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
detailsColumn.setCellFactory(new Callback<>() {
private void setTradeIdColumnCellFactory() {
tradeIdColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
tradeIdColumn.setCellFactory(new Callback<>() {
@Override
public TableCell<LockedListItem, LockedListItem> call(TableColumn<LockedListItem,
@ -320,13 +324,12 @@ public class LockedView extends ActivatableView<VBox, Void> {
if (item != null && !empty) {
Optional<Tradable> tradableOptional = getTradable(item);
if (tradableOptional.isPresent()) {
field = new HyperlinkWithIcon(item.getDetails(),
AwesomeIcon.INFO_SIGN);
field = new HyperlinkWithIcon(item.getTrade().getId(), AwesomeIcon.INFO_SIGN);
field.setOnAction(event -> openDetailPopup(item));
field.setTooltip(new Tooltip(Res.get("tooltip.openPopupForDetails")));
setGraphic(field);
} else {
setGraphic(new AutoTooltipLabel(item.getDetails()));
setGraphic(new AutoTooltipLabel(item.getTrade().getId()));
}
} else {
@ -340,6 +343,31 @@ public class LockedView extends ActivatableView<VBox, Void> {
});
}
private void setDetailsColumnCellFactory() {
detailsColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
detailsColumn.setCellFactory(new Callback<>() {
@Override
public TableCell<LockedListItem, LockedListItem> call(TableColumn<LockedListItem,
LockedListItem> column) {
return new TableCell<>() {
private HyperlinkWithIcon field;
@Override
public void updateItem(final LockedListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null && !empty) {
setGraphic(new AutoTooltipLabel(item.getDetails()));
} else {
setGraphic(null);
}
}
};
}
});
}
private void setAddressColumnCellFactory() {
addressColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper<>(addressListItem.getValue()));