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

Merge branch 'release-candidate-0.9.0' into bug-fixes-dao

Browse source
This commit is contained in:
Manfred Karrer 2018-11-30 17:36:30 +01:00
commit 3c6342f4d6
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
17 changed files with 49 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java
View file

@ -120,7 +120,7 @@ public class MoneyGramAccountPayload extends PaymentAccountPayload {
" " + this.state + "\n") : "";
return Res.getWithCol("payment.account.fullName") + " " + holderName + "\n" +
state +
Res.getWithCol("payment.account.country") + " " + CountryUtil.getNameByCode(countryCode) + "\n" +
Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode) + "\n" +
Res.getWithCol("payment.email") + " " + email;
}

2
core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java
View file

@ -90,7 +90,7 @@ public final class PromptPayAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return Res.getWithCol("payment.promptPay.promptPayId") + promptPayId;
return Res.getWithCol("payment.promptPay.promptPayId") + " " + promptPayId;
}
@Override

2
core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java
View file

@ -89,7 +89,7 @@ public final class RevolutAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account") + accountId;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account") + " " + accountId;
}
@Override

9
desktop/src/main/java/bisq/desktop/bisq.css
View file

@ -156,7 +156,8 @@ bg color of non edit textFields: fafafa
-fx-default-button: derive(-fx-accent, 95%);
-fx-focus-color: -fx-accent;
-fx-selection-bar: -bs-rd-nav-primary-background;
/*-fx-selection-bar: -bs-rd-nav-primary-background;*/
-fx-selection-bar: #e1f5e3;
-fx-selection-bar-non-focused: -fx-selection-bar;
@ -1034,7 +1035,7 @@ textfield */
}
.table-view .table-row-cell:selected .table-row-cell:row-selection .table-row-cell:cell-selection .text {
-fx-fill: -bs-rd-white;
-fx-fill: -bs-rd-black;
}
.table-view .table-row-cell:selected .button .text {
@ -1047,7 +1048,7 @@ textfield */
}
.table-view .table-row-cell:selected .copy-icon .text {
-fx-fill: -bs-rd-white;
-fx-fill: -bs-rd-black;
}
.table-view .table-row-cell:selected .copy-icon .text:hover {
@ -1055,7 +1056,7 @@ textfield */
}
.table-view .table-row-cell:selected .hyperlink .text {
-fx-fill: -bs-rd-white;
-fx-fill: -bs-rd-black;
-fx-border-style: none;
-fx-border-width: 0px;
}

2
desktop/src/main/java/bisq/desktop/components/BalanceTextField.java
View file

@ -47,7 +47,7 @@ public class BalanceTextField extends AnchorPane {
///////////////////////////////////////////////////////////////////////////////////////////
public BalanceTextField(String label) {
textField = new JFXTextField();
textField = new BisqTextField();
textField.setLabelFloat(true);
textField.setPromptText(label);
textField.setFocusTraversable(false);

2
desktop/src/main/java/bisq/desktop/components/InfoTextField.java
View file

@ -58,7 +58,7 @@ public class InfoTextField extends AnchorPane {
public InfoTextField() {
arrowLocation = PopOver.ArrowLocation.RIGHT_TOP;;
textField = new JFXTextField();
textField = new BisqTextField();
textField.setLabelFloat(true);
textField.setEditable(false);
textField.textProperty().bind(text);

4
desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java
View file

@ -55,6 +55,8 @@ public class MoneyGramForm extends PaymentMethodForm {
final MoneyGramAccountPayload payload = (MoneyGramAccountPayload) paymentAccountPayload;
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.fullName"),
payload.getHolderName());
addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.email"),
payload.getEmail());
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow,
Res.get("payment.bank.country"),
CountryUtil.getNameAndCode(((MoneyGramAccountPayload) paymentAccountPayload).getCountryCode()));
@ -62,8 +64,6 @@ public class MoneyGramForm extends PaymentMethodForm {
addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1,
Res.get("payment.account.state"),
payload.getState());
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.email"),
payload.getEmail());
return gridRow;
}

4
desktop/src/main/java/bisq/desktop/components/paymentmethods/SpecificBankForm.java
View file

@ -18,7 +18,6 @@
package bisq.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.FormBuilder;
import bisq.core.locale.Res;
import bisq.core.payment.AccountAgeWitnessService;
@ -40,6 +39,7 @@ import javafx.scene.layout.GridPane;
import javafx.beans.binding.Bindings;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addTopLabelInputTextFieldButton;
import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldButton;
@ -104,7 +104,7 @@ public class SpecificBankForm extends BankForm {
@Override
public void addAcceptedBanksForDisplayAccount() {
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.accepted.banks"),
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.accepted.banks"),
Joiner.on(", ").join(specificBanksAccountPayload.getAcceptedBanks())).second.setMouseTransparent(false);
}

5
desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java
View file

@ -39,6 +39,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
public class SwishForm extends PaymentMethodForm {
@ -50,9 +51,9 @@ public class SwishForm extends PaymentMethodForm {
public static int addFormForBuyer(GridPane gridPane, int gridRow,
PaymentAccountPayload paymentAccountPayload) {
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"),
((SwishAccountPayload) paymentAccountPayload).getHolderName());
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.mobile"),
addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.mobile"),
((SwishAccountPayload) paymentAccountPayload).getMobileNr());
return gridRow;
}

4
desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java
View file

@ -46,8 +46,8 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm {
PaymentAccountPayload paymentAccountPayload) {
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"),
((USPostalMoneyOrderAccountPayload) paymentAccountPayload).getHolderName());
TextArea textArea = addTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.postal.address"), "").second;
textArea.setPrefHeight(60);
TextArea textArea = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.postal.address"), "").second;
textArea.setPrefHeight(70);
textArea.setEditable(false);
textArea.setId("text-area-disabled");
textArea.setText(((USPostalMoneyOrderAccountPayload) paymentAccountPayload).getPostalAddress());

6
desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java
View file

@ -57,13 +57,13 @@ public class WesternUnionForm extends PaymentMethodForm {
final WesternUnionAccountPayload payload = (WesternUnionAccountPayload) paymentAccountPayload;
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.fullName"),
payload.getHolderName());
addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.email"),
payload.getEmail());
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.city"),
payload.getCity());
if (BankUtil.isStateRequired(payload.getCountryCode()))
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.state"),
addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.account.state"),
payload.getState());
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.email"),
payload.getEmail());
return gridRow;
}

2
desktop/src/main/java/bisq/desktop/main/MainView.java
View file

@ -391,7 +391,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
marketPriceBox.setAlignment(Pos.CENTER_LEFT);
ComboBox<PriceFeedComboBoxItem> priceComboBox = new JFXComboBox<>();
priceComboBox.setVisibleRowCount(20);
priceComboBox.setVisibleRowCount(12);
priceComboBox.setFocusTraversable(false);
priceComboBox.setId("price-feed-combo");
priceComboBox.setPadding(new Insets(0, 0, -4, 0));

6
desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RoleDetailsWindow.java
View file

@ -69,7 +69,7 @@ class RoleDetailsWindow extends Overlay<RoleDetailsWindow> {
@Override
protected void createGridPane() {
super.createGridPane();
gridPane.setPadding(new Insets(35, 40, 30, 40));
gridPane.setPadding(new Insets(70, 80, 60, 80));
gridPane.getStyleClass().add("grid-pane");
}
@ -83,8 +83,8 @@ class RoleDetailsWindow extends Overlay<RoleDetailsWindow> {
FormBuilder.addTopLabelTextField(gridPane, ++rowIndex, Res.get("dao.bond.details.unlockTime"),
Res.get("dao.bond.details.blocks", bondedRoleType.getUnlockTimeInBlocks()));
FormBuilder.addLabelHyperlinkWithIcon(gridPane, ++rowIndex, Res.get("dao.bond.details.link"),
bondedRoleType.getLink(), bondedRoleType.getLink());
FormBuilder.addTopLabelHyperlinkWithIcon(gridPane, ++rowIndex, Res.get("dao.bond.details.link"),
bondedRoleType.getLink(), bondedRoleType.getLink(), 0);
FormBuilder.addTopLabelTextField(gridPane, ++rowIndex, Res.get("dao.bond.details.isSingleton"),
bsqFormatter.booleanToYesNo(bondedRoleType.isAllowMultipleHolders()));

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

@ -190,7 +190,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
currencyComboBox = currencyBoxTuple.third;
paymentMethodComboBox = paymentBoxTuple.third;
paymentMethodComboBox.setVisibleRowCount(20);
paymentMethodComboBox.setVisibleRowCount(12);
paymentMethodComboBox.setButtonCell(GUIUtil.getPaymentMethodButtonCell());
paymentMethodComboBox.setCellFactory(GUIUtil.getPaymentMethodCellFactory());
@ -860,12 +860,13 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
iconView.setId("image-remove");
title = Res.get("shared.remove");
button.setId("cancel-button");
button.setStyle("-fx-text-fill: #444;"); // does not take the font colors sometimes from the style
button.setOnAction(e -> onRemoveOpenOffer(offer));
} else {
boolean isSellOffer = offer.getDirection() == OfferPayload.Direction.SELL;
iconView.setId(isSellOffer ? "image-buy-white" : "image-sell-white");
button.setId(isSellOffer ? "buy-button" : "sell-button");
button.setStyle("-fx-text-fill: white;"); // does not take the font colors sometimes from the style
title = Res.get("offerbook.takeOffer");
button.setTooltip(new Tooltip(Res.get("offerbook.takeOfferButton.tooltip", model.getDirectionLabelTooltip(offer))));
button.setOnAction(e -> onTakeOffer(offer));

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

@ -53,6 +53,7 @@ import javafx.scene.image.ImageView;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javafx.geometry.HPos;
import javafx.geometry.Insets;
import java.util.List;
@ -159,8 +160,8 @@ public class OfferDetailsWindow extends Overlay<OfferDetailsWindow> {
addTitledGroupBg(gridPane, ++rowIndex, rows, Res.get("shared.Offer"));
String fiatDirectionInfo = ":";
String btcDirectionInfo = ":";
String fiatDirectionInfo = "";
String btcDirectionInfo = "";
OfferPayload.Direction direction = offer.getDirection();
String currencyCode = offer.getCurrencyCode();
String offerTypeLabel = Res.get("shared.offerType");
@ -342,6 +343,7 @@ public class OfferDetailsWindow extends Overlay<OfferDetailsWindow> {
} else {
Button closeButton = addButtonAfterGroup(gridPane, ++rowIndex, Res.get("shared.close"));
GridPane.setColumnIndex(closeButton, 1);
GridPane.setHalignment(closeButton, HPos.RIGHT);
closeButton.setOnAction(e -> {
closeHandlerOptional.ifPresent(Runnable::run);

2
docs/build.md
View file

@ -15,7 +15,7 @@ You do _not_ need to install Gradle to complete the following command. The `grad
./gradlew build
If on Windows use the `gradlew.bat` script instead.
If on Windows run `gradlew.bat build` instead.
## Run

15
scripts/install_java.sh Normal file
View file

@ -0,0 +1,15 @@
#!/usr/bin/env bash
JAVA_HOME=/usr/lib/jvm/openjdk-10.0.2
if [ ! -d "$JAVA_HOME" ]; then
apt-get -y install curl
curl -L -O https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz
mkdir -p $JAVA_HOME
tar -zxf openjdk-10.0.2_linux-x64_bin.tar.gz -C $JAVA_HOME --strip 1
rm openjdk-10.0.2_linux-x64_bin.tar.gz
update-alternatives --install /usr/bin/java java $JAVA_HOME/bin/java 2000
update-alternatives --install /usr/bin/javac javac $JAVA_HOME/bin/javac 2000
fi