mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove non existing id style "cancel-button"

Browse source
This commit is contained in:
Christoph Atteneder 2020-01-08 18:18:04 +01:00
parent 5dcd98b1fa
commit bb45676f10
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
5 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java
View file

@ -156,7 +156,7 @@ public abstract class MutableOfferView<M extends MutableOfferViewModel<?>> exten
priceAsPercentageValueCurrencyBox, volumeValueCurrencyBox, priceValueCurrencyBox,
minAmountValueCurrencyBox, advancedOptionsBox, paymentGroupBox;
private Subscription isWaitingForFundsSubscription, balanceSubscription, cancelButton2StyleSubscription;
private Subscription isWaitingForFundsSubscription, balanceSubscription;
private ChangeListener<Boolean> amountFocusedListener, minAmountFocusedListener, volumeFocusedListener,
buyerSecurityDepositFocusedListener, priceFocusedListener, placeOfferCompletedListener,
priceAsPercentageFocusedListener, getShowWalletFundedNotificationListener,
@ -662,15 +662,11 @@ public abstract class MutableOfferView<M extends MutableOfferViewModel<?>> exten
waitingForFundsLabel.setManaged(isWaitingForFunds);
});
cancelButton2StyleSubscription = EasyBind.subscribe(placeOfferButton.visibleProperty(),
isVisible -> cancelButton2.setId(isVisible ? "cancel-button" : null));
balanceSubscription = EasyBind.subscribe(model.getDataModel().getBalance(), balanceTextField::setBalance);
}
private void removeSubscriptions() {
isWaitingForFundsSubscription.unsubscribe();
cancelButton2StyleSubscription.unsubscribe();
balanceSubscription.unsubscribe();
}

2
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
View file

@ -1001,7 +1001,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
if (myOffer) {
iconView.setId("image-remove");
title = Res.get("shared.remove");
button.setId("cancel-button");
button.setId(null);
button.setOnAction(e -> onRemoveOpenOffer(offer));
} else {
boolean isSellOffer = offer.getDirection() == OfferPayload.Direction.SELL;

5
desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
View file

@ -153,7 +153,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
private BusyAnimation waitingForFundsBusyAnimation, offerAvailabilityBusyAnimation;
private Notification walletFundedNotification;
private OfferView.CloseHandler closeHandler;
private Subscription cancelButton2StyleSubscription, balanceSubscription,
private Subscription balanceSubscription,
showTransactionPublishedScreenSubscription, showWarningInvalidBtcDecimalPlacesSubscription,
isWaitingForFundsSubscription, offerWarningSubscription, errorMessageSubscription,
isOfferAvailableSubscription;
@ -760,8 +760,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
});*/
balanceSubscription = EasyBind.subscribe(model.dataModel.getBalance(), balanceTextField::setBalance);
cancelButton2StyleSubscription = EasyBind.subscribe(takeOfferButton.visibleProperty(),
isVisible -> cancelButton2.setId(isVisible ? "cancel-button" : null));
}
private void removeSubscriptions() {
@ -773,7 +771,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
showTransactionPublishedScreenSubscription.unsubscribe();
// noSufficientFeeSubscription.unsubscribe();
balanceSubscription.unsubscribe();
cancelButton2StyleSubscription.unsubscribe();
}
private void addListeners() {

1
desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
View file

@ -385,7 +385,6 @@ public class OfferDetailsWindow extends Overlay<OfferDetailsWindow> {
Button cancelButton = new AutoTooltipButton(Res.get("shared.cancel"));
cancelButton.setDefaultButton(false);
cancelButton.setId("cancel-button");
cancelButton.setOnAction(e -> {
closeHandlerOptional.ifPresent(Runnable::run);
hide();

1
desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.java
View file

@ -196,7 +196,6 @@ public class EditOfferView extends MutableOfferView<EditOfferViewModel> {
cancelButton = new AutoTooltipButton(Res.get("shared.cancel"));
cancelButton.setDefaultButton(false);
cancelButton.setId("cancel-button");
cancelButton.setOnAction(event -> close());
editOfferConfirmationBox.getChildren().add(cancelButton);