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

Adapt Arbitrator registration window

Browse source
This commit is contained in:
Christoph Atteneder 2018-11-13 15:58:50 +01:00
parent 21aa91f41d
commit 0ac911bbdf
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/resources/i18n/displayStrings.properties
View file

@ -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

3
desktop/src/main/java/bisq/desktop/main/account/arbitratorregistration/ArbitratorRegistrationView.java
View file

@ -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);

8
desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockArbitrationRegistrationWindow.java
View file

@ -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);

9
desktop/src/main/java/bisq/desktop/util/FormBuilder.java
View file

@ -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);
}