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

Remove status column

Browse source
This commit is contained in:
Manfred Karrer 2015-04-05 02:37:25 +02:00
parent 1ab7ee5a94
commit c56047b34e
3 changed files with 2 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -137,7 +137,6 @@
<!--<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"/>
<TableColumn text="Online" fx:id="statusColumn" minWidth="20" sortable="false"/>
</columns> </columns>
</TableView> </TableView>

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

@ -42,9 +42,7 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.beans.value.ChangeListener;
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;
@ -69,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, statusColumn; /*countryColumn,*/ bankAccountTypeColumn;
@FXML Label amountBtcLabel, priceDescriptionLabel, priceFiatLabel, volumeDescriptionLabel, volumeFiatLabel, @FXML Label amountBtcLabel, priceDescriptionLabel, priceFiatLabel, volumeDescriptionLabel, volumeFiatLabel,
extendedButton1Label, extendedButton2Label, extendedCheckBoxLabel; extendedButton1Label, extendedButton2Label, extendedCheckBoxLabel;
@ -109,7 +107,6 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
/* setCountryColumnCellFactory();*/ /* setCountryColumnCellFactory();*/
setBankAccountTypeColumnCellFactory(); setBankAccountTypeColumnCellFactory();
setDirectionColumnCellFactory(); setDirectionColumnCellFactory();
setStatusColumnCellFactory();
table.getSortOrder().add(priceColumn); table.getSortOrder().add(priceColumn);
table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY); table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
@ -512,67 +509,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
}); });
} }
private void setStatusColumnCellFactory() {
statusColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
statusColumn.setCellFactory(
new Callback<TableColumn<OfferBookListItem, OfferBookListItem>, TableCell<OfferBookListItem,
OfferBookListItem>>() {
@Override
public TableCell<OfferBookListItem, OfferBookListItem> call(
TableColumn<OfferBookListItem, OfferBookListItem> column) {
return new TableCell<OfferBookListItem, OfferBookListItem>() {
final ImageView iconView = new ImageView();
private ChangeListener<Offer.State> stateChangeListener;
private ObjectProperty<Offer.State> stateProperty;
private void updateIcon(final OfferBookListItem item) {
Offer offer = item.getOffer();
if (model.isMyOffer(offer)) {
iconView.setId("image-offer_state_available");
}
else {
switch (offer.getState()) {
case UNKNOWN:
iconView.setId("image-offer_state_unknown");
break;
case AVAILABLE:
iconView.setId("image-offer_state_available");
break;
case OFFERER_OFFLINE:
case RESERVED:
case FAULT:
case REMOVED:
iconView.setId("image-offer_state_not_available");
break;
}
}
}
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null) {
stateProperty = item.getOffer().stateProperty();
this.stateChangeListener = (ov, o, n) -> updateIcon(item);
stateProperty.addListener(stateChangeListener);
updateIcon(item);
setGraphic(iconView);
}
else {
if (stateProperty != null && stateChangeListener != null) {
stateProperty.removeListener(stateChangeListener);
stateChangeListener = null;
}
setGraphic(null);
}
}
};
}
});
}
/* private void setCountryColumnCellFactory() { /* private void setCountryColumnCellFactory() {
countryColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); countryColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));

6
doc/new_tag.sh
View file

@ -1,6 +0,0 @@
#!/bin/bash
cd /Users/mk/Documents/_intellij/bitsquare
git tag v0.1.3
git push --tags