From 48b4c3ce9c3b4f801279cd26134b1f46905e0d33 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 21 Nov 2018 11:49:57 +0100 Subject: [PATCH] Increase first line padding --- .../resources/i18n/displayStrings.properties | 42 +++++++++---------- .../steps/buyer/BuyerStep2View.java | 12 +++--- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index a334887306..c5d40d082c 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -137,7 +137,7 @@ shared.saveNewAccount=Save new account shared.selectedAccount=Selected account shared.deleteAccount=Delete account shared.errorMessageInline=\nError message: {0} -shared.errorMessage=Error message: +shared.errorMessage=Error message shared.information=Information shared.name=Name shared.id=ID @@ -363,8 +363,8 @@ createOffer.amountPriceBox.sell.volumeDescription=Amount in {0} to receive createOffer.amountPriceBox.minAmountDescription=Minimum amount of BTC createOffer.securityDeposit.prompt=Security deposit in BTC createOffer.fundsBox.title=Fund your offer -createOffer.fundsBox.offerFee=Trade fee: -createOffer.fundsBox.networkFee=Mining fee: +createOffer.fundsBox.offerFee=Trade fee +createOffer.fundsBox.networkFee=Mining fee createOffer.fundsBox.placeOfferSpinnerInfo=Offer publishing is in progress ... createOffer.fundsBox.paymentLabel=Bisq trade with ID {0} createOffer.fundsBox.fundsStructure=({0} security deposit, {1} trade fee, {2} mining fee) @@ -425,9 +425,9 @@ takeOffer.validation.amountLargerThanOfferAmount=Input amount cannot be higher t takeOffer.validation.amountLargerThanOfferAmountMinusFee=That input amount would create dust change for the BTC seller. takeOffer.fundsBox.title=Fund your trade takeOffer.fundsBox.isOfferAvailable=Check if offer is available ... -takeOffer.fundsBox.tradeAmount=Amount to sell: -takeOffer.fundsBox.offerFee=Trade fee: -takeOffer.fundsBox.networkFee=Total mining fees: +takeOffer.fundsBox.tradeAmount=Amount to sell +takeOffer.fundsBox.offerFee=Trade fee +takeOffer.fundsBox.networkFee=Total mining fees takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress ... takeOffer.fundsBox.paymentLabel=Bisq trade with ID {0} takeOffer.fundsBox.fundsStructure=({0} security deposit, {1} trade fee, {2} mining fee) @@ -770,7 +770,7 @@ funds.tx.compensationRequestTxFee=Compensation request support.tab.support=Support tickets support.tab.ArbitratorsSupportTickets=Arbitrator's support tickets support.tab.TradersSupportTickets=Trader's support tickets -support.filter=Filter list: +support.filter=Filter list support.noTickets=There are no open tickets support.sendingMessage=Sending Message... support.receiverNotOnline=Receiver is not online. Message is saved to his mailbox. @@ -901,7 +901,7 @@ settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin nod Disputes caused by that would be decided in favor of the other peer. No technical support will be given \ to users who ignore our warning and protection mechanisms! settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you get connected exclusively to that.) -settings.net.p2PPeersLabel=Connected peers: +settings.net.p2PPeersLabel=Connected peers settings.net.onionAddressColumn=Onion address settings.net.creationDateColumn=Established settings.net.connectionTypeColumn=In/Out @@ -1118,11 +1118,11 @@ account.notifications.webCamWindow.headline=Scan QR-code from phone account.notifications.webcam.label=Use webcam account.notifications.webcam.button=Scan QR code account.notifications.noWebcam.button=I don't have a webcam -account.notifications.testMsg.label=Send test notification: +account.notifications.testMsg.label=Send test notification account.notifications.testMsg.title=Test account.notifications.erase.label=Clear notifications on phone account.notifications.erase.title=Clear notifications -account.notifications.email.label=Pairing token: +account.notifications.email.label=Pairing token account.notifications.email.prompt=Enter pairing token you received by email account.notifications.settings.title=Settings account.notifications.useSound.label=Play notification sound on phone @@ -1712,11 +1712,11 @@ dao.feeTx.confirm.details={0} fee: {1}\n\ #################################################################### contractWindow.title=Dispute details -contractWindow.dates=Offer date / Trade date: -contractWindow.btcAddresses=Bitcoin address BTC buyer / BTC seller: -contractWindow.onions=Network address BTC buyer / BTC seller: -contractWindow.numDisputes=No. of disputes BTC buyer / BTC seller: -contractWindow.contractHash=Contract hash: +contractWindow.dates=Offer date / Trade date +contractWindow.btcAddresses=Bitcoin address BTC buyer / BTC seller +contractWindow.onions=Network address BTC buyer / BTC seller +contractWindow.numDisputes=No. of disputes BTC buyer / BTC seller +contractWindow.contractHash=Contract hash displayAlertMessageWindow.headline=Important information! displayAlertMessageWindow.update.headline=Important update information! @@ -1848,20 +1848,20 @@ You can also change later the base currency at the \"Settings/Network\" screen. selectBaseCurrencyWindow.select=Select base currency sendAlertMessageWindow.headline=Send global notification -sendAlertMessageWindow.alertMsg=Alert message: +sendAlertMessageWindow.alertMsg=Alert message sendAlertMessageWindow.enterMsg=Enter message -sendAlertMessageWindow.isUpdate=Is update notification: -sendAlertMessageWindow.version=New version no.: +sendAlertMessageWindow.isUpdate=Is update notification +sendAlertMessageWindow.version=New version no. sendAlertMessageWindow.send=Send notification sendAlertMessageWindow.remove=Remove notification sendPrivateNotificationWindow.headline=Send private message -sendPrivateNotificationWindow.privateNotification=Private notification: +sendPrivateNotificationWindow.privateNotification=Private notification sendPrivateNotificationWindow.enterNotification=Enter notification sendPrivateNotificationWindow.send=Send private notification showWalletDataWindow.walletData=Wallet data -showWalletDataWindow.includePrivKeys=Include private keys: +showWalletDataWindow.includePrivKeys=Include private keys # We do not translate the tac because of the legal nature. We would need translations checked by lawyers # in each language which is too expensive atm. @@ -2211,7 +2211,7 @@ seed.enterSeedWords=Enter wallet seed words seed.date=Wallet date seed.restore.title=Restore wallets from seed words seed.restore=Restore wallets -seed.creationDate=Creation date: +seed.creationDate=Creation date seed.warn.walletNotEmpty.msg=Your Bitcoin wallet is not empty.\n\n\ You must empty this wallet before attempting to restore an older one, as mixing wallets \ together can lead to invalidated backups.\n\n\ diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java index 7b2b76f833..54b8f04d27 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java @@ -50,7 +50,6 @@ import bisq.desktop.components.paymentmethods.WesternUnionForm; import bisq.desktop.main.overlays.popups.Popup; import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView; -import bisq.desktop.util.FormBuilder; import bisq.desktop.util.Layout; import bisq.core.locale.CurrencyUtil; @@ -90,6 +89,8 @@ import java.util.List; import static bisq.desktop.util.FormBuilder.addButtonBusyAnimationLabel; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static bisq.desktop.util.FormBuilder.addTitledGroupBg; +import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; import static com.google.common.base.Preconditions.checkNotNull; public class BuyerStep2View extends TradeStepView { @@ -198,11 +199,10 @@ public class BuyerStep2View extends TradeStepView { PaymentAccountPayload paymentAccountPayload = model.dataModel.getSellersPaymentAccountPayload(); String paymentMethodId = paymentAccountPayload != null ? paymentAccountPayload.getPaymentMethodId() : ""; - TitledGroupBg accountTitledGroupBg = FormBuilder.addTitledGroupBg(gridPane, ++gridRow, 2, + TitledGroupBg accountTitledGroupBg = addTitledGroupBg(gridPane, ++gridRow, 4, Res.get("portfolio.pending.step2_buyer.startPaymentUsing", Res.get(paymentMethodId)), Layout.COMPACT_GROUP_DISTANCE); - accountTitledGroupBg.getStyleClass().add("last"); - TextFieldWithCopyIcon field = addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 0, + TextFieldWithCopyIcon field = addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 0, Res.get("portfolio.pending.step2_buyer.amountToTransfer"), model.getFiatVolume(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE).second; @@ -210,7 +210,7 @@ public class BuyerStep2View extends TradeStepView { if (!(paymentAccountPayload instanceof CryptoCurrencyAccountPayload) && !(paymentAccountPayload instanceof F2FAccountPayload)) - addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, + addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("shared.reasonForPayment"), model.dataModel.getReference(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE); @@ -322,7 +322,7 @@ public class BuyerStep2View extends TradeStepView { } } - GridPane.setRowSpan(accountTitledGroupBg, gridRow - 3); + GridPane.setRowSpan(accountTitledGroupBg, gridRow - 1); Tuple4 tuple3 = addButtonBusyAnimationLabel(gridPane, ++gridRow, 0, Res.get("portfolio.pending.step2_buyer.paymentStarted"), 10);