From 0ac911bbdfa3436bb9d3f2d1a71c7db833650af5 Mon Sep 17 00:00:00 2001
From: Christoph Atteneder <christoph.atteneder@gmail.com>
Date: Tue, 13 Nov 2018 15:58:50 +0100
Subject: [PATCH] Adapt Arbitrator registration window

---
 core/src/main/resources/i18n/displayStrings.properties   | 2 +-
 .../ArbitratorRegistrationView.java                      | 3 ++-
 .../windows/UnlockArbitrationRegistrationWindow.java     | 8 ++++++--
 desktop/src/main/java/bisq/desktop/util/FormBuilder.java | 9 ++++++++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 1ca4106c73..3f47e6e190 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -157,7 +157,7 @@ shared.tradePrice=Trade price
 shared.tradeAmount=Trade amount
 shared.tradeVolume=Trade volume
 shared.invalidKey=The key you entered was not correct.
-shared.enterPrivKey=Enter private key to unlock:
+shared.enterPrivKey=Enter private key to unlock
 shared.makerFeeTxId=Maker fee transaction ID
 shared.takerFeeTxId=Taker fee transaction ID
 shared.payoutTxId=Payout transaction ID
diff --git a/desktop/src/main/java/bisq/desktop/main/account/arbitratorregistration/ArbitratorRegistrationView.java b/desktop/src/main/java/bisq/desktop/main/account/arbitratorregistration/ArbitratorRegistrationView.java
index 2ea0418b8e..3a36b3510b 100644
--- a/desktop/src/main/java/bisq/desktop/main/account/arbitratorregistration/ArbitratorRegistrationView.java
+++ b/desktop/src/main/java/bisq/desktop/main/account/arbitratorregistration/ArbitratorRegistrationView.java
@@ -67,6 +67,7 @@ import javafx.util.StringConverter;
 import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup;
 import static bisq.desktop.util.FormBuilder.addMultilineLabel;
 import static bisq.desktop.util.FormBuilder.addTitledGroupBg;
+import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
 
 @FxmlView
 public class ArbitratorRegistrationView extends ActivatableViewAndModel<VBox, ArbitratorRegistrationViewModel> {
@@ -148,7 +149,7 @@ public class ArbitratorRegistrationView extends ActivatableViewAndModel<VBox, Ar
         root.getChildren().add(gridPane);
 
         addTitledGroupBg(gridPane, gridRow, 3, Res.get("account.tab.arbitratorRegistration"));
-        TextField pubKeyTextField = FormBuilder.addTopLabelTextField(gridPane, gridRow, Res.get("account.arbitratorRegistration.pubKey"),
+        TextField pubKeyTextField = addTopLabelTextField(gridPane, gridRow, Res.get("account.arbitratorRegistration.pubKey"),
                 model.registrationPubKeyAsHex.get(), Layout.FIRST_ROW_DISTANCE).second;
 
         pubKeyTextField.textProperty().bind(model.registrationPubKeyAsHex);
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockArbitrationRegistrationWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockArbitrationRegistrationWindow.java
index 234c0848d0..a961d1f5a8 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockArbitrationRegistrationWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockArbitrationRegistrationWindow.java
@@ -25,16 +25,19 @@ import bisq.core.locale.Res;
 
 import bisq.common.app.DevEnv;
 import bisq.common.util.Tuple2;
+import bisq.common.util.Tuple3;
 
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.input.KeyCode;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
 
 import javafx.beans.value.ChangeListener;
 
 import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup;
-import static bisq.desktop.util.FormBuilder.addTopLabelInputTextField;
+import static bisq.desktop.util.FormBuilder.addTopLabelInputTextFieldWithVBox;
 
 public class UnlockArbitrationRegistrationWindow extends Overlay<UnlockArbitrationRegistrationWindow> {
     private final boolean useDevPrivilegeKeys;
@@ -109,8 +112,9 @@ public class UnlockArbitrationRegistrationWindow extends Overlay<UnlockArbitrati
     }
 
     private void addInputFields() {
-        final Tuple2<Label, InputTextField> labelInputTextFieldTuple2 = addTopLabelInputTextField(gridPane,
+        final Tuple3<Label, InputTextField, VBox> labelInputTextFieldTuple2 = addTopLabelInputTextFieldWithVBox(gridPane,
                 ++rowIndex, Res.get("shared.enterPrivKey"), 3);
+        GridPane.setColumnSpan(labelInputTextFieldTuple2.third, 2);
         Label label = labelInputTextFieldTuple2.first;
         label.setWrapText(true);
 
diff --git a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
index 6c45e14bba..d2f268058e 100644
--- a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
+++ b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
@@ -530,11 +530,18 @@ public class FormBuilder {
 
     public static Tuple2<Label, InputTextField> addTopLabelInputTextField(GridPane gridPane, int rowIndex, String title, double top) {
 
+        final Tuple3<Label, InputTextField, VBox> topLabelWithVBox = addTopLabelInputTextFieldWithVBox(gridPane, rowIndex, title, top);
+
+        return new Tuple2<>(topLabelWithVBox.first, topLabelWithVBox.second);
+    }
+
+    public static Tuple3<Label, InputTextField, VBox> addTopLabelInputTextFieldWithVBox(GridPane gridPane, int rowIndex, String title, double top) {
+
         InputTextField inputTextField = new InputTextField();
 
         final Tuple2<Label, VBox> topLabelWithVBox = addTopLabelWithVBox(gridPane, rowIndex, title, inputTextField, top);
 
-        return new Tuple2<>(topLabelWithVBox.first, inputTextField);
+        return new Tuple3<>(topLabelWithVBox.first, inputTextField, topLabelWithVBox.second);
     }