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

Fix display bug in pending trades

Browse Source
This commit is contained in:
Manfred Karrer 2015-03-17 16:41:51 +01:00
parent e6744fb727
commit 831c001fb4
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap/src/main/resources/logback.xml
View File

@ -24,7 +24,7 @@
</appender>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>bootstrapNode.log</file>
<file>.bitsquare/bootstrapNode.log</file>
<append>false</append>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
<fileNamePattern>bootstrapNode_%i.log</fileNamePattern>

2
core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml
View File

@ -166,7 +166,7 @@
<InfoDisplay fx:id="paymentsInfoDisplay" onAction="#onOpenPaymentsHelp" rowIndex="10" gridPane="$gridPane"
managed="false" visible="false"/>
<Button fx:id="paymentsButton" text="Payment started" onAction="#onPaymentStarted" GridPane.rowIndex="11"
<Button fx:id="paymentStartedButton" text="Payment started" onAction="#onPaymentStarted" GridPane.rowIndex="11"
GridPane.columnIndex="1" defaultButton="true" managed="false" visible="false">
<GridPane.margin>
<Insets top="15" bottom="40"/>

6
core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
View File

@ -66,7 +66,7 @@ public class PendingTradesView extends ActivatableViewAndModel<AnchorPane, Pendi
@FXML TableView<PendingTradesListItem> table;
@FXML InputTextField withdrawAddressTextField;
@FXML InfoDisplay infoDisplay, paymentsInfoDisplay, summaryInfoDisplay;
@FXML Button confirmPaymentReceiptButton, paymentsButton, withdrawButton;
@FXML Button confirmPaymentReceiptButton, paymentStartedButton, withdrawButton;
@FXML TitledGroupBg titledGroupBg, paymentsGroupBg, summaryGroupBg, withdrawGroupBg;
@FXML TextFieldWithCopyIcon fiatAmountTextField, holderNameTextField, secondaryIdTextField, primaryIdTextField;
@FXML TextField statusTextField, paymentMethodTextField, btcTradeAmountTextField, fiatTradeAmountTextField,
@ -427,7 +427,7 @@ public class PendingTradesView extends ActivatableViewAndModel<AnchorPane, Pendi
paymentMethodTextField.setVisible(visible);
paymentsInfoDisplay.setVisible(visible);
paymentsButton.setVisible(visible);
paymentStartedButton.setVisible(visible);
fiatAmountTextField.setVisible(visible);
holderNameTextField.setVisible(visible);
@ -446,7 +446,7 @@ public class PendingTradesView extends ActivatableViewAndModel<AnchorPane, Pendi
paymentMethodTextField.setManaged(visible);
paymentsInfoDisplay.setManaged(visible);
paymentsButton.setManaged(visible);
paymentStartedButton.setManaged(visible);
fiatAmountTextField.setManaged(visible);
holderNameTextField.setManaged(visible);

4
core/src/main/java/io/bitsquare/trade/Trade.java
View File

@ -186,14 +186,14 @@ public class Trade implements Serializable {
// When serialized those transient properties are not instantiated, so we need to instantiate them at first access
public ObjectProperty<Coin> tradeAmountProperty() {
if (_tradeAmount == null)
_tradeAmount = new SimpleObjectProperty<>();
_tradeAmount = new SimpleObjectProperty<>(tradeAmount);
return _tradeAmount;
}
public ObjectProperty<Fiat> tradeVolumeProperty() {
if (_tradeVolume == null)
_tradeVolume = new SimpleObjectProperty<>();
_tradeVolume = new SimpleObjectProperty<>(getTradeVolume());
return _tradeVolume;
}

2
core/src/main/resources/logback.xml
View File

@ -7,7 +7,7 @@
</appender>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>.bitsquare_logs/bitsquare.log</file>
<file>.bitsquare/bitsquare.log</file>
<append>false</append>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
<fileNamePattern>.bitsquare_logs/bitsquare_%i.log</fileNamePattern>