From 055afc19cdc9eb937e2b4c16e59868cba059e86f Mon Sep 17 00:00:00 2001 From: Devin Bileck <603793+devinbileck@users.noreply.github.com> Date: Tue, 20 Nov 2018 22:43:01 -0800 Subject: [PATCH 01/17] Add install_java.sh --- scripts/install_java.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 scripts/install_java.sh diff --git a/scripts/install_java.sh b/scripts/install_java.sh new file mode 100644 index 0000000000..c1419a456b --- /dev/null +++ b/scripts/install_java.sh @@ -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 From db4c633fed7c464fa41b48beddfffb24528ed4dd Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 15:53:00 +0100 Subject: [PATCH 02/17] Use lighter selection color --- desktop/src/main/java/bisq/desktop/bisq.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/bisq.css b/desktop/src/main/java/bisq/desktop/bisq.css index e90d967a24..a422b3383d 100644 --- a/desktop/src/main/java/bisq/desktop/bisq.css +++ b/desktop/src/main/java/bisq/desktop/bisq.css @@ -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; } From f191a944e6c08be1dc20a11e2fd77b90e31b280b Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 16:01:39 +0100 Subject: [PATCH 03/17] Reduce number of items in combobox list --- desktop/src/main/java/bisq/desktop/main/MainView.java | 2 +- .../java/bisq/desktop/main/offer/offerbook/OfferBookView.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/MainView.java b/desktop/src/main/java/bisq/desktop/main/MainView.java index 1b0155f389..4b96498b92 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainView.java +++ b/desktop/src/main/java/bisq/desktop/main/MainView.java @@ -391,7 +391,7 @@ public class MainView extends InitializableView { marketPriceBox.setAlignment(Pos.CENTER_LEFT); ComboBox 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)); diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java index beb9e467b1..404541bd77 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java @@ -190,7 +190,7 @@ public class OfferBookView extends ActivatableViewAndModel Date: Thu, 29 Nov 2018 16:33:28 +0100 Subject: [PATCH 04/17] Fix wrong resource key --- .../java/bisq/core/payment/payload/MoneyGramAccountPayload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java index c75aa021ff..361e87361c 100644 --- a/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java @@ -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; } From 647f5b1073ca4e6e0a342e9dd0e5ceb59026aa3b Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 16:39:24 +0100 Subject: [PATCH 05/17] Fix scrolling issue and wrong resource key. Fixes #2001. --- .../bisq/desktop/components/paymentmethods/MoneyGramForm.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java index a6e0a2c2c2..a6b1b67352 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java @@ -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; } From f380e8124bffa1041866569b44d262618586881e Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 16:47:44 +0100 Subject: [PATCH 06/17] Add additional space --- .../java/bisq/core/payment/payload/PromptPayAccountPayload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java index 1b52906c3b..568272c7ae 100644 --- a/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java @@ -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 From 5238a61f4f3932597c4e4ef5e7397db50e6fde34 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 16:52:11 +0100 Subject: [PATCH 07/17] Remove unnecessary colons --- .../desktop/main/overlays/windows/OfferDetailsWindow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java index 555a9f7c5f..3c7eebe4ff 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java @@ -159,8 +159,8 @@ public class OfferDetailsWindow extends Overlay { 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"); From cba70566f727b0792d30668e7f20d909170be815 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 16:59:33 +0100 Subject: [PATCH 08/17] Use BisqTextField to align top label right --- .../src/main/java/bisq/desktop/components/BalanceTextField.java | 2 +- .../src/main/java/bisq/desktop/components/InfoTextField.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/components/BalanceTextField.java b/desktop/src/main/java/bisq/desktop/components/BalanceTextField.java index 6e18416892..4409ee39ef 100644 --- a/desktop/src/main/java/bisq/desktop/components/BalanceTextField.java +++ b/desktop/src/main/java/bisq/desktop/components/BalanceTextField.java @@ -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); diff --git a/desktop/src/main/java/bisq/desktop/components/InfoTextField.java b/desktop/src/main/java/bisq/desktop/components/InfoTextField.java index 7e091d96d6..fb1a2c6c03 100644 --- a/desktop/src/main/java/bisq/desktop/components/InfoTextField.java +++ b/desktop/src/main/java/bisq/desktop/components/InfoTextField.java @@ -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); From 32fb8010cf7638aca47f9155fe6a88cb1c80b6b7 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 17:01:00 +0100 Subject: [PATCH 09/17] Add additional space --- .../java/bisq/core/payment/payload/RevolutAccountPayload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java index 289917275f..fa2be433b6 100644 --- a/core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java @@ -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 From 257170675dfc410c8c5c13d596d7644702dde022 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 20:53:42 +0100 Subject: [PATCH 10/17] Remove top padding --- .../desktop/components/paymentmethods/SpecificBankForm.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SpecificBankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SpecificBankForm.java index cbcc30a4a1..1f0e6fd377 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SpecificBankForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SpecificBankForm.java @@ -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); } From 8b8022aa7efa49f4c535cc87eb8d0aa3d11d06b6 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 20:54:17 +0100 Subject: [PATCH 11/17] Position cancel button right --- .../bisq/desktop/main/overlays/windows/OfferDetailsWindow.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java index 3c7eebe4ff..6111bd47de 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java @@ -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; @@ -342,6 +343,7 @@ public class OfferDetailsWindow extends Overlay { } 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); From 2e88b5ee19c9a51b8c43c59bb10afcfbb5cabb62 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 20:54:59 +0100 Subject: [PATCH 12/17] Add workaround again for button labels --- .../java/bisq/desktop/main/offer/offerbook/OfferBookView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java index 404541bd77..29dc459825 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java @@ -860,12 +860,13 @@ public class OfferBookView extends ActivatableViewAndModel 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)); From 89707ae66338c0e2b5b6805ddb141ce8cd803632 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 21:03:14 +0100 Subject: [PATCH 13/17] Improve Swish form for buyer --- .../bisq/desktop/components/paymentmethods/SwishForm.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java index 4a64ef7589..4258f6214c 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java @@ -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; } From 8b290c3a5027928f934e77571545215e77971ad8 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 21:07:35 +0100 Subject: [PATCH 14/17] Improve USPostalMoneyOrder form for buyer --- .../components/paymentmethods/USPostalMoneyOrderForm.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java index d344e496bf..0aa70c7049 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java @@ -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()); From a018068bc274640c9d80a8cbce8dfb016f84a31f Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 29 Nov 2018 21:12:25 +0100 Subject: [PATCH 15/17] Improve WesternUnion form for buyer --- .../desktop/components/paymentmethods/WesternUnionForm.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java index 296262aaa0..9470cd2b2c 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java @@ -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; } From 91766ecad32fea83d8db565bd60dd5887f7a0c80 Mon Sep 17 00:00:00 2001 From: BravoIndia <33473721+BravoIndia@users.noreply.github.com> Date: Fri, 30 Nov 2018 15:56:36 +0700 Subject: [PATCH 16/17] Update build.md --- docs/build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build.md b/docs/build.md index 4de1f750bf..b7ba483032 100644 --- a/docs/build.md +++ b/docs/build.md @@ -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 From cbbc723cd1e128db23710243c2e9c830d4451e2e Mon Sep 17 00:00:00 2001 From: sqrrm Date: Fri, 30 Nov 2018 16:15:53 +0100 Subject: [PATCH 17/17] Make role details popup readable --- .../desktop/main/dao/bonding/roles/RoleDetailsWindow.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RoleDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RoleDetailsWindow.java index 4abcabc7c2..85e48b11ce 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RoleDetailsWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RoleDetailsWindow.java @@ -69,7 +69,7 @@ class RoleDetailsWindow extends Overlay { @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 { 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()));