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

UI improvements

Browse source
This commit is contained in:
Manfred Karrer 2016-01-18 23:33:24 +01:00
parent d88c0bc2e6
commit 18319bcb52
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java
View file

@ -110,7 +110,10 @@ public class CompletedView extends TradeStepDetailsView {
withdrawAmountTextField = addLabelTextField(gridPane, gridRow, "Amount to withdraw:", "", Layout.FIRST_ROW_AND_GROUP_DISTANCE).second; withdrawAmountTextField = addLabelTextField(gridPane, gridRow, "Amount to withdraw:", "", Layout.FIRST_ROW_AND_GROUP_DISTANCE).second;
withdrawAddressTextField = addLabelInputTextField(gridPane, ++gridRow, "Withdraw to address:").second; withdrawAddressTextField = addLabelInputTextField(gridPane, ++gridRow, "Withdraw to address:").second;
withdrawButton = addButtonAfterGroup(gridPane, ++gridRow, "Withdraw to external wallet"); withdrawButton = addButtonAfterGroup(gridPane, ++gridRow, "Withdraw to external wallet");
withdrawButton.setOnAction(e -> model.onWithdrawRequest(withdrawAddressTextField.getText())); withdrawButton.setOnAction(e -> {
model.onWithdrawRequest(withdrawAddressTextField.getText());
withdrawButton.setDisable(true);
});
if (BitsquareApp.DEV_MODE) if (BitsquareApp.DEV_MODE)
withdrawAddressTextField.setText("mwajQdfYnve1knXnmv7JdeiVpeogTsck6S"); withdrawAddressTextField.setText("mwajQdfYnve1knXnmv7JdeiVpeogTsck6S");

10
gui/src/main/java/io/bitsquare/gui/popups/SelectDepositTxPopup.java
View file

@ -19,8 +19,10 @@ package io.bitsquare.gui.popups;
import io.bitsquare.common.util.Tuple2; import io.bitsquare.common.util.Tuple2;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.geometry.Insets;
import javafx.scene.control.ComboBox; import javafx.scene.control.ComboBox;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.layout.GridPane;
import javafx.util.StringConverter; import javafx.util.StringConverter;
import org.bitcoinj.core.Transaction; import org.bitcoinj.core.Transaction;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -77,15 +79,17 @@ public class SelectDepositTxPopup extends Popup {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
private void addContent() { private void addContent() {
addMultilineLabel(gridPane, ++rowIndex, Label label = addMultilineLabel(gridPane, ++rowIndex,
"The deposit transaction was not stored in the trade.\n" + "The deposit transaction was not stored in the trade.\n" +
"Please select one of the existing MultiSig transactions from your wallet which was the " + "Please select one of the existing MultiSig transactions from your wallet which was the " +
"deposit transaction used in the failed trade.", "deposit transaction used in the failed trade.",
10); 10);
Tuple2<Label, ComboBox> tuple = addLabelComboBox(gridPane, ++rowIndex); GridPane.setMargin(label, new Insets(0, 0, 10, 0));
Tuple2<Label, ComboBox> tuple = addLabelComboBox(gridPane, ++rowIndex, "Select deposit transaction");
transactionsComboBox = tuple.second; transactionsComboBox = tuple.second;
transactionsComboBox.setPromptText("Select deposit transaction"); transactionsComboBox.setPromptText("Select");
transactionsComboBox.setConverter(new StringConverter<Transaction>() { transactionsComboBox.setConverter(new StringConverter<Transaction>() {
@Override @Override
public String toString(Transaction transaction) { public String toString(Transaction transaction) {