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

Rename peergroup

Browse source
This commit is contained in:
Manfred Karrer 2015-12-31 16:17:01 +01:00
parent 7dc08b0459
commit 67fb7aa825
13 changed files with 83 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
View file

@ -39,7 +39,6 @@ import io.bitsquare.gui.main.portfolio.PortfolioView;
import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView;
import io.bitsquare.gui.popups.OfferDetailsPopup;
import io.bitsquare.gui.popups.Popup;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.FormBuilder;
import io.bitsquare.gui.util.Layout;
import io.bitsquare.locale.BSResources;
@ -69,7 +68,6 @@ import static javafx.beans.binding.Bindings.createStringBinding;
public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateOfferViewModel> {
private final Navigation navigation;
private final BSFormatter formatter;
private final OfferDetailsPopup offerDetailsPopup;
private ScrollPane scrollPane;
@ -113,11 +111,10 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private CreateOfferView(CreateOfferViewModel model, Navigation navigation, BSFormatter formatter, OfferDetailsPopup offerDetailsPopup) {
private CreateOfferView(CreateOfferViewModel model, Navigation navigation, OfferDetailsPopup offerDetailsPopup) {
super(model);
this.navigation = navigation;
this.formatter = formatter;
this.offerDetailsPopup = offerDetailsPopup;
}

15
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.offer.createoffer;
import io.bitsquare.app.BitsquareApp;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.gui.common.model.ActivatableWithDataModel;
import io.bitsquare.gui.common.model.ViewModel;
@ -122,6 +123,20 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
@Override
protected void activate() {
if (BitsquareApp.DEV_MODE) {
amount.set("0.0001");
minAmount.set(amount.get());
price.set("400");
volume.set("0.04");
setAmountToModel();
setMinAmountToModel();
setPriceToModel();
calculateVolume();
dataModel.calculateTotalToPay();
updateButtonDisableState();
}
addBindings();
addListeners();

9
gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
View file

@ -18,11 +18,9 @@
package io.bitsquare.gui.main.offer.takeoffer;
import com.google.inject.Inject;
import io.bitsquare.app.BitsquareApp;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.FeePolicy;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.*;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.common.handlers.ResultHandler;
import io.bitsquare.gui.common.model.ActivatableDataModel;
@ -136,6 +134,9 @@ class TakeOfferDataModel extends ActivatableDataModel {
amountAsCoin.set(offer.getAmount());
if (BitsquareApp.DEV_MODE)
amountAsCoin.set(Restrictions.MIN_TRADE_AMOUNT);
calculateVolume();
calculateTotalToPay();

22
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java
View file

@ -121,20 +121,18 @@ public class SellerSubView extends TradeSubView {
break;
case WAIT_FOR_PAYOUT_TX:
if (model.getLockTime() > 0) {
waitTxInBlockchain.setCompleted();
waitPaymentStarted.setCompleted();
confirmPaymentReceived.setCompleted();
showItem(waitPayoutUnlock);
waitTxInBlockchain.setCompleted();
waitPaymentStarted.setCompleted();
confirmPaymentReceived.setCompleted();
showItem(waitPayoutUnlock);
// We don't use a wizard for that step as it only gets displayed in case the other peer is offline
tradeStepDetailsView = new WaitPayoutFinalizedView(model);
contentPane.getChildren().setAll(tradeStepDetailsView);
// We don't use a wizard for that step as it only gets displayed in case the other peer is offline
tradeStepDetailsView = new WaitPayoutFinalizedView(model);
contentPane.getChildren().setAll(tradeStepDetailsView);
((WaitPayoutFinalizedView) tradeStepDetailsView).setInfoLabelText("We requested the trading peer to sign and finalize the payout " +
"transaction.\n" +
"It might be that the other peer is offline, so we need to wait until he finalize the transaction when he goes online again.");
}
((WaitPayoutFinalizedView) tradeStepDetailsView).setInfoLabelText("We requested the trading peer to sign and finalize the payout " +
"transaction.\n" +
"It might be that the other peer is offline, so we need to wait until he finalize the transaction when he goes online again.");
break;
case WAIT_FOR_UNLOCK_PAYOUT:
waitTxInBlockchain.setCompleted();