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

Fix bug with missing "Show all" entry at payment method combobox

Browse source
This commit is contained in:
Manfred Karrer 2016-03-19 12:19:06 +01:00
parent 29682661fc
commit 78a195c705
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
View file

@ -181,18 +181,22 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
@Override @Override
protected void activate() { protected void activate() {
currencyComboBox.setItems(model.getTradeCurrencies()); currencyComboBox.setItems(model.getTradeCurrencies());
currencyComboBox.setVisibleRowCount(Math.min(currencyComboBox.getItems().size(), 25));
currencyComboBox.setOnAction(e -> model.onSetTradeCurrency(currencyComboBox.getSelectionModel().getSelectedItem()));
if (model.showAllTradeCurrenciesProperty.get()) if (model.showAllTradeCurrenciesProperty.get())
currencyComboBox.getSelectionModel().select(0); currencyComboBox.getSelectionModel().select(0);
else else
currencyComboBox.getSelectionModel().select(model.getSelectedTradeCurrency()); currencyComboBox.getSelectionModel().select(model.getSelectedTradeCurrency());
currencyComboBox.setVisibleRowCount(Math.min(currencyComboBox.getItems().size(), 25));
paymentMethodComboBox.setItems(model.getPaymentMethods());
paymentMethodComboBox.getSelectionModel().select(0);
currencyComboBox.setOnAction(e -> model.onSetTradeCurrency(currencyComboBox.getSelectionModel().getSelectedItem())); paymentMethodComboBox.setItems(model.getPaymentMethods());
paymentMethodComboBox.setOnAction(e -> model.onSetPaymentMethod(paymentMethodComboBox.getSelectionModel().getSelectedItem())); paymentMethodComboBox.setOnAction(e -> model.onSetPaymentMethod(paymentMethodComboBox.getSelectionModel().getSelectedItem()));
if (model.showAllPaymentMethods)
paymentMethodComboBox.getSelectionModel().select(0);
else
paymentMethodComboBox.getSelectionModel().select(model.selectedPaymentMethod);
createOfferButton.setOnAction(e -> onCreateOffer()); createOfferButton.setOnAction(e -> onCreateOffer());
volumeColumn.textProperty().bind(createStringBinding( volumeColumn.textProperty().bind(createStringBinding(
@ -212,11 +216,9 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
model.getOfferList().comparatorProperty().bind(tableView.comparatorProperty()); model.getOfferList().comparatorProperty().bind(tableView.comparatorProperty());
tableView.setItems(model.getOfferList()); tableView.setItems(model.getOfferList());
priceColumn.setSortType((model.getDirection() == Offer.Direction.BUY) ? TableColumn.SortType.ASCENDING : TableColumn.SortType.DESCENDING); priceColumn.setSortType((model.getDirection() == Offer.Direction.BUY) ? TableColumn.SortType.ASCENDING : TableColumn.SortType.DESCENDING);
tableView.sort(); tableView.sort();
} }
@Override @Override

6
gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java
View file

@ -88,13 +88,13 @@ class OfferBookViewModel extends ActivatableViewModel {
// If id is empty string we ignore filter (display all methods) // If id is empty string we ignore filter (display all methods)
private PaymentMethod selectedPaymentMethod = new PaymentMethod(SHOW_ALL_FLAG, 0, 0, null); PaymentMethod selectedPaymentMethod = new PaymentMethod(SHOW_ALL_FLAG, 0, 0, null);
private final ObservableList<OfferBookListItem> offerBookListItems; private final ObservableList<OfferBookListItem> offerBookListItems;
private final ListChangeListener<OfferBookListItem> listChangeListener; private final ListChangeListener<OfferBookListItem> listChangeListener;
private boolean isTabSelected; private boolean isTabSelected;
final BooleanProperty showAllTradeCurrenciesProperty = new SimpleBooleanProperty(); final BooleanProperty showAllTradeCurrenciesProperty = new SimpleBooleanProperty();
private boolean showAllPaymentMethods = true; boolean showAllPaymentMethods = true;
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@ -242,7 +242,7 @@ class OfferBookViewModel extends ActivatableViewModel {
public ObservableList<PaymentMethod> getPaymentMethods() { public ObservableList<PaymentMethod> getPaymentMethods() {
ObservableList<PaymentMethod> list = FXCollections.observableArrayList(PaymentMethod.ALL_VALUES); ObservableList<PaymentMethod> list = FXCollections.observableArrayList(PaymentMethod.ALL_VALUES);
list.add(0, selectedPaymentMethod); list.add(0, new PaymentMethod(SHOW_ALL_FLAG, 0, 0, null));
return list; return list;
} }