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

Fix sorting

Browse Source
This commit is contained in:
Manfred Karrer 2016-05-21 21:36:43 +02:00
parent 4116f91c6e
commit a181617e58
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
View File

@ -181,8 +181,6 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
paymentMethodColumn.setComparator((o1, o2) -> o1.getOffer().getPaymentMethod().compareTo(o2.getOffer().getPaymentMethod()));
avatarColumn.setComparator((o1, o2) -> o1.getOffer().getOwnerNodeAddress().hostName.compareTo(o2.getOffer().getOwnerNodeAddress().hostName));
priceColumn.sortableProperty().bind(model.showAllTradeCurrenciesProperty.not());
createOfferButton = addButton(root, ++gridRow, "");
createOfferButton.setMinHeight(40);
createOfferButton.setPadding(new Insets(0, 20, 0, 20));
@ -204,6 +202,8 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
else
currencyComboBox.getSelectionModel().select(model.getSelectedTradeCurrency());
priceColumn.sortableProperty().bind(model.showAllTradeCurrenciesProperty.not());
amountColumn.sortableProperty().bind(model.showAllTradeCurrenciesProperty.not());
paymentMethodComboBox.setItems(model.getPaymentMethods());
paymentMethodComboBox.setOnAction(e -> model.onSetPaymentMethod(paymentMethodComboBox.getSelectionModel().getSelectedItem()));
@ -242,6 +242,9 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
createOfferButton.setOnAction(null);
volumeColumn.textProperty().unbind();
model.getOfferList().comparatorProperty().unbind();
priceColumn.sortableProperty().unbind();
amountColumn.sortableProperty().unbind();
}

12
gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
View File

@ -74,12 +74,12 @@
<PropertyValueFactory property="onionAddress"/>
</cellValueFactory>
</TableColumn>
<TableColumn text="In/Out" fx:id="connectionTypeColumn" minWidth="80" maxWidth="90">
<TableColumn text="In/Out" fx:id="connectionTypeColumn" minWidth="80" maxWidth="90" sortable="false">
<cellValueFactory>
<PropertyValueFactory property="connectionType"/>
</cellValueFactory>
</TableColumn>
<TableColumn text="Established" fx:id="creationDateColumn" minWidth="180" maxWidth="180">
<TableColumn text="Established" fx:id="creationDateColumn" minWidth="180" maxWidth="180" sortable="false">
<cellValueFactory>
<PropertyValueFactory property="creationDate"/>
</cellValueFactory>
@ -89,22 +89,22 @@
<PropertyValueFactory property="lastActivity"/>
</cellValueFactory>
</TableColumn>-->
<TableColumn text="Roundtrip" fx:id="roundTripTimeColumn" minWidth="80" maxWidth="80">
<TableColumn text="Roundtrip" fx:id="roundTripTimeColumn" minWidth="80" maxWidth="80" sortable="false">
<cellValueFactory>
<PropertyValueFactory property="roundTripTime"/>
</cellValueFactory>
</TableColumn>
<TableColumn text="Sent" fx:id="sentBytesColumn" minWidth="100" maxWidth="120">
<TableColumn text="Sent" fx:id="sentBytesColumn" minWidth="100" maxWidth="120" sortable="false">
<cellValueFactory>
<PropertyValueFactory property="sentBytes"/>
</cellValueFactory>
</TableColumn>
<TableColumn text="Received" fx:id="receivedBytesColumn" minWidth="100" maxWidth="120">
<TableColumn text="Received" fx:id="receivedBytesColumn" minWidth="100" maxWidth="120" sortable="false">
<cellValueFactory>
<PropertyValueFactory property="receivedBytes"/>
</cellValueFactory>
</TableColumn>
<TableColumn text="Peer type" fx:id="peerTypeColumn" minWidth="100" maxWidth="100">
<TableColumn text="Peer type" fx:id="peerTypeColumn" minWidth="100" maxWidth="100" sortable="false">
<cellValueFactory>
<PropertyValueFactory property="peerType"/>
</cellValueFactory>