Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-22 14:41:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

remove 'revert tx' column from transactions view

Browse source
This commit is contained in:
woodser 2025-07-11 09:44:26 -04:00 • committed by GitHub
parent a2f54215de
commit 181bb2aa26
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.fxml
View file

@ -40,7 +40,6 @@
<TableColumn fx:id="txFeeColumn" minWidth="110" maxWidth="110"/> <TableColumn fx:id="txFeeColumn" minWidth="110" maxWidth="110"/>
<TableColumn fx:id="confidenceColumn" minWidth="70" maxWidth="130"/> <TableColumn fx:id="confidenceColumn" minWidth="70" maxWidth="130"/>
<TableColumn fx:id="memoColumn" minWidth="40" maxWidth="250"/> <TableColumn fx:id="memoColumn" minWidth="40" maxWidth="250"/>
<TableColumn fx:id="revertTxColumn" sortable="false" minWidth="110" maxWidth="110" visible="false"/>
</columns> </columns>
</TableView> </TableView>
<HBox spacing="10"> <HBox spacing="10">

40
desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.java
View file

@ -20,7 +20,6 @@ package haveno.desktop.main.funds.transactions;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.googlecode.jcsv.writer.CSVEntryConverter; import com.googlecode.jcsv.writer.CSVEntryConverter;
import de.jensd.fx.fontawesome.AwesomeIcon; import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
import haveno.core.api.XmrConnectionService; import haveno.core.api.XmrConnectionService;
import haveno.core.locale.Res; import haveno.core.locale.Res;
import haveno.core.offer.OpenOffer; import haveno.core.offer.OpenOffer;
@ -47,13 +46,11 @@ import javafx.event.EventHandler;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.geometry.Insets; import javafx.geometry.Insets;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.TableCell; import javafx.scene.control.TableCell;
import javafx.scene.control.TableColumn; import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView; import javafx.scene.control.TableView;
import javafx.scene.control.Tooltip; import javafx.scene.control.Tooltip;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent; import javafx.scene.input.KeyEvent;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority; import javafx.scene.layout.Priority;
@ -70,7 +67,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
@FXML @FXML
TableView<TransactionsListItem> tableView; TableView<TransactionsListItem> tableView;
@FXML @FXML
TableColumn<TransactionsListItem, TransactionsListItem> dateColumn, detailsColumn, addressColumn, transactionColumn, amountColumn, txFeeColumn, confidenceColumn, memoColumn, revertTxColumn; TableColumn<TransactionsListItem, TransactionsListItem> dateColumn, detailsColumn, addressColumn, transactionColumn, amountColumn, txFeeColumn, confidenceColumn, memoColumn;
@FXML @FXML
Label numItems; Label numItems;
@FXML @FXML
@ -137,7 +134,6 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
txFeeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.txFee", Res.getBaseCurrencyCode()))); txFeeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.txFee", Res.getBaseCurrencyCode())));
confidenceColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.confirmations", Res.getBaseCurrencyCode()))); confidenceColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.confirmations", Res.getBaseCurrencyCode())));
memoColumn.setGraphic(new AutoTooltipLabel(Res.get("funds.tx.memo"))); memoColumn.setGraphic(new AutoTooltipLabel(Res.get("funds.tx.memo")));
revertTxColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.revert", Res.getBaseCurrencyCode())));
tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN); tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
tableView.setPlaceholder(new AutoTooltipLabel(Res.get("funds.tx.noTxAvailable"))); tableView.setPlaceholder(new AutoTooltipLabel(Res.get("funds.tx.noTxAvailable")));
@ -151,7 +147,6 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
setTxFeeColumnCellFactory(); setTxFeeColumnCellFactory();
setConfidenceColumnCellFactory(); setConfidenceColumnCellFactory();
setMemoColumnCellFactory(); setMemoColumnCellFactory();
setRevertTxColumnCellFactory();
dateColumn.setComparator(Comparator.comparing(TransactionsListItem::getDate)); dateColumn.setComparator(Comparator.comparing(TransactionsListItem::getDate));
detailsColumn.setComparator((o1, o2) -> { detailsColumn.setComparator((o1, o2) -> {
@ -170,10 +165,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
tableView.getSortOrder().add(dateColumn); tableView.getSortOrder().add(dateColumn);
keyEventEventHandler = event -> { keyEventEventHandler = event -> {
// Not intended to be public to users as the feature is not well tested // unused
if (Utilities.isAltOrCtrlPressed(KeyCode.R, event)) {
revertTxColumn.setVisible(!revertTxColumn.isVisible());
}
}; };
HBox.setHgrow(spacer, Priority.ALWAYS); HBox.setHgrow(spacer, Priority.ALWAYS);
@ -204,7 +196,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
numItems.setText(Res.get("shared.numItemsLabel", sortedDisplayedTransactions.size())); numItems.setText(Res.get("shared.numItemsLabel", sortedDisplayedTransactions.size()));
exportButton.setOnAction(event -> { exportButton.setOnAction(event -> {
final ObservableList<TableColumn<TransactionsListItem, ?>> tableColumns = GUIUtil.getContentColumns(tableView); final ObservableList<TableColumn<TransactionsListItem, ?>> tableColumns = GUIUtil.getContentColumns(tableView);
final int reportColumns = tableColumns.size() - 1; // CSV report excludes the last column (an icon) final int reportColumns = tableColumns.size();
CSVEntryConverter<TransactionsListItem> headerConverter = item -> { CSVEntryConverter<TransactionsListItem> headerConverter = item -> {
String[] columns = new String[reportColumns]; String[] columns = new String[reportColumns];
for (int i = 0; i < columns.length; i++) for (int i = 0; i < columns.length; i++)
@ -501,31 +493,5 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
} }
}); });
} }
private void setRevertTxColumnCellFactory() {
revertTxColumn.setCellValueFactory((addressListItem) ->
new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
revertTxColumn.setCellFactory(
new Callback<>() {
@Override
public TableCell<TransactionsListItem, TransactionsListItem> call(TableColumn<TransactionsListItem,
TransactionsListItem> column) {
return new TableCell<>() {
Button button;
@Override
public void updateItem(final TransactionsListItem item, boolean empty) {
super.updateItem(item, empty);
setGraphic(null);
if (button != null) {
button.setOnAction(null);
button = null;
}
}
};
}
});
}
} }