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

Remove country flag in offerbook for alpha verison #302

Browse source
This commit is contained in:
Manfred Karrer 2014-12-01 00:06:50 +01:00
parent 1726e1fc87
commit daea94c178
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml
View file

@ -134,7 +134,7 @@
<TableColumn text="Amount in BTC (Min.)" fx:id="amountColumn" minWidth="130"/> <TableColumn text="Amount in BTC (Min.)" fx:id="amountColumn" minWidth="130"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="130"/> <TableColumn text="Price" fx:id="priceColumn" minWidth="130"/>
<TableColumn text="Amount in EUR (Min.)" fx:id="volumeColumn" minWidth="130"/> <TableColumn text="Amount in EUR (Min.)" fx:id="volumeColumn" minWidth="130"/>
<TableColumn text="Country" fx:id="countryColumn" minWidth="60"/> <!--<TableColumn text="Country" fx:id="countryColumn" minWidth="60"/>-->
<TableColumn text="Bank transfer type" fx:id="bankAccountTypeColumn" minWidth="130"/> <TableColumn text="Bank transfer type" fx:id="bankAccountTypeColumn" minWidth="130"/>
<TableColumn text="" fx:id="directionColumn" minWidth="80" sortable="false"/> <TableColumn text="" fx:id="directionColumn" minWidth="80" sortable="false"/>

17
src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
View file

@ -31,7 +31,6 @@ import io.bitsquare.gui.util.ImageUtil;
import io.bitsquare.gui.util.validation.OptionalBtcValidator; import io.bitsquare.gui.util.validation.OptionalBtcValidator;
import io.bitsquare.gui.util.validation.OptionalFiatValidator; import io.bitsquare.gui.util.validation.OptionalFiatValidator;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.locale.Country;
import io.bitsquare.offer.Direction; import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer; import io.bitsquare.offer.Offer;
@ -47,7 +46,6 @@ import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.transformation.SortedList; import javafx.collections.transformation.SortedList;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.geometry.Pos;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.image.*; import javafx.scene.image.*;
import javafx.scene.layout.*; import javafx.scene.layout.*;
@ -59,6 +57,8 @@ import org.controlsfx.dialog.Dialog;
import static javafx.beans.binding.Bindings.createStringBinding; import static javafx.beans.binding.Bindings.createStringBinding;
// Note: countryColumn is deactivated in alpha version
@FxmlView @FxmlView
public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookViewModel> { public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookViewModel> {
@ -67,7 +67,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
@FXML InputTextField volumeTextField, amountTextField, priceTextField; @FXML InputTextField volumeTextField, amountTextField, priceTextField;
@FXML Button createOfferButton, showAdvancedSettingsButton, openCountryFilterButton, openPaymentMethodsFilterButton; @FXML Button createOfferButton, showAdvancedSettingsButton, openCountryFilterButton, openPaymentMethodsFilterButton;
@FXML TableColumn<OfferBookListItem, OfferBookListItem> priceColumn, amountColumn, volumeColumn, directionColumn, @FXML TableColumn<OfferBookListItem, OfferBookListItem> priceColumn, amountColumn, volumeColumn, directionColumn,
countryColumn, bankAccountTypeColumn; /*countryColumn,*/ bankAccountTypeColumn;
@FXML Label amountBtcLabel, priceDescriptionLabel, priceFiatLabel, volumeDescriptionLabel, volumeFiatLabel, @FXML Label amountBtcLabel, priceDescriptionLabel, priceFiatLabel, volumeDescriptionLabel, volumeFiatLabel,
extendedButton1Label, extendedButton2Label, extendedCheckBoxLabel; extendedButton1Label, extendedButton2Label, extendedCheckBoxLabel;
@ -104,7 +104,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
setAmountColumnCellFactory(); setAmountColumnCellFactory();
setPriceColumnCellFactory(); setPriceColumnCellFactory();
setVolumeColumnCellFactory(); setVolumeColumnCellFactory();
setCountryColumnCellFactory(); /* setCountryColumnCellFactory();*/
setBankAccountTypeColumnCellFactory(); setBankAccountTypeColumnCellFactory();
setDirectionColumnCellFactory(); setDirectionColumnCellFactory();
@ -342,8 +342,9 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
amountColumn.setComparator((o1, o2) -> o1.getOffer().getAmount().compareTo(o2.getOffer().getAmount())); amountColumn.setComparator((o1, o2) -> o1.getOffer().getAmount().compareTo(o2.getOffer().getAmount()));
volumeColumn.setComparator((o1, o2) -> volumeColumn.setComparator((o1, o2) ->
o1.getOffer().getOfferVolume().compareTo(o2.getOffer().getOfferVolume())); o1.getOffer().getOfferVolume().compareTo(o2.getOffer().getOfferVolume()));
countryColumn.setComparator((o1, o2) -> o1.getOffer().getBankAccountCountry().getName().compareTo(o2.getOffer() /* countryColumn.setComparator((o1, o2) -> o1.getOffer().getBankAccountCountry().getName().compareTo(o2
.getBankAccountCountry().getName())); .getOffer()
.getBankAccountCountry().getName()));*/
bankAccountTypeColumn.setComparator((o1, o2) -> o1.getOffer().getBankAccountType().compareTo(o2.getOffer() bankAccountTypeColumn.setComparator((o1, o2) -> o1.getOffer().getBankAccountType().compareTo(o2.getOffer()
.getBankAccountType())); .getBankAccountType()));
} }
@ -493,7 +494,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
}); });
} }
private void setCountryColumnCellFactory() { /* private void setCountryColumnCellFactory() {
countryColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); countryColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
countryColumn.setCellFactory( countryColumn.setCellFactory(
new Callback<TableColumn<OfferBookListItem, OfferBookListItem>, TableCell<OfferBookListItem, new Callback<TableColumn<OfferBookListItem, OfferBookListItem>, TableCell<OfferBookListItem,
@ -526,7 +527,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
}; };
} }
}); });
} }*/
private void setBankAccountTypeColumnCellFactory() { private void setBankAccountTypeColumnCellFactory() {
bankAccountTypeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); bankAccountTypeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));