mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adapt layout of popup windows

Browse Source
This commit is contained in:
Christoph Atteneder 2018-11-21 15:31:49 +01:00
parent 5f78103bae
commit 4c95d030e8
No known key found for this signature in database
GPG Key ID: CD5DC1C529CDFD3B
9 changed files with 65 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/resources/i18n/displayStrings.properties
View File

@ -1795,16 +1795,16 @@ emptyWalletWindow.sent.success=The balance of your wallet was successfully trans
enterPrivKeyWindow.headline=Registration open for invited arbitrators only
filterWindow.headline=Edit filter list
filterWindow.offers=Filtered offers (comma sep.):
filterWindow.onions=Filtered onion addresses (comma sep.):
filterWindow.offers=Filtered offers (comma sep.)
filterWindow.onions=Filtered onion addresses (comma sep.)
filterWindow.accounts=Filtered trading account data:\nFormat: comma sep. list of [payment method id | data field | value]
filterWindow.bannedCurrencies=Filtered currency codes (comma sep.):
filterWindow.bannedPaymentMethods=Filtered payment method IDs (comma sep.):
filterWindow.arbitrators=Filtered arbitrators (comma sep. onion addresses):
filterWindow.seedNode=Filtered seed nodes (comma sep. onion addresses):
filterWindow.priceRelayNode=Filtered price relay nodes (comma sep. onion addresses):
filterWindow.btcNode=Filtered Bitcoin nodes (comma sep. addresses + port):
filterWindow.preventPublicBtcNetwork=Prevent usage of public Bitcoin network:
filterWindow.bannedCurrencies=Filtered currency codes (comma sep.)
filterWindow.bannedPaymentMethods=Filtered payment method IDs (comma sep.)
filterWindow.arbitrators=Filtered arbitrators (comma sep. onion addresses)
filterWindow.seedNode=Filtered seed nodes (comma sep. onion addresses)
filterWindow.priceRelayNode=Filtered price relay nodes (comma sep. onion addresses)
filterWindow.btcNode=Filtered Bitcoin nodes (comma sep. addresses + port)
filterWindow.preventPublicBtcNetwork=Prevent usage of public Bitcoin network
filterWindow.add=Add filter
filterWindow.remove=Remove filter

4
desktop/src/main/java/bisq/desktop/bisq.css
View File

@ -255,8 +255,8 @@ bg color of non edit textFields: fafafa
.separator *.line {
-fx-border-style: solid;
-fx-border-width: 0 1 0 0;
-fx-border-color: -bs-rd-separator;
-fx-border-width: 0 0 1 0;
-fx-border-color: -bs-rd-separator-dark;
}
.jfx-progress-bar > .bar,

24
desktop/src/main/java/bisq/desktop/main/debug/DebugView.java
View File

@ -20,7 +20,6 @@ package bisq.desktop.main.debug;
import bisq.desktop.common.view.FxmlView;
import bisq.desktop.common.view.InitializableView;
import bisq.desktop.components.TitledGroupBg;
import bisq.desktop.util.FormBuilder;
import bisq.core.offer.availability.tasks.ProcessOfferAvailabilityResponse;
import bisq.core.offer.availability.tasks.SendOfferAvailabilityRequest;
@ -61,12 +60,14 @@ import bisq.core.trade.protocol.tasks.taker.TakerVerifyMakerAccount;
import bisq.core.trade.protocol.tasks.taker.TakerVerifyMakerFeePayment;
import bisq.common.taskrunner.Task;
import bisq.common.util.Tuple2;
import javax.inject.Inject;
import javafx.fxml.FXML;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
@ -76,6 +77,8 @@ import javafx.util.StringConverter;
import java.util.Arrays;
import static bisq.desktop.util.FormBuilder.addTopLabelComboBox;
@FxmlView
public class DebugView extends InitializableView<GridPane, Void> {
@ -90,20 +93,20 @@ public class DebugView extends InitializableView<GridPane, Void> {
@Override
public void initialize() {
addGroup("OfferAvailabilityProtocol: ",
addGroup("OfferAvailabilityProtocol",
FXCollections.observableArrayList(Arrays.asList(
SendOfferAvailabilityRequest.class,
ProcessOfferAvailabilityResponse.class)
));
addGroup("PlaceOfferProtocol: ",
addGroup("PlaceOfferProtocol",
FXCollections.observableArrayList(Arrays.asList(
ValidateOffer.class,
CreateMakerFeeTx.class,
AddToOfferBook.class)
));
addGroup("BuyerAsMakerProtocol: ",
addGroup("BuyerAsMakerProtocol",
FXCollections.observableArrayList(Arrays.asList(
MakerProcessPayDepositRequest.class,
CheckIfPeerIsBanned.class,
@ -127,7 +130,7 @@ public class DebugView extends InitializableView<GridPane, Void> {
BuyerSendCounterCurrencyTransferStartedMessage.class,
BuyerSetupPayoutTxListener.class)
));
addGroup("SellerAsTakerProtocol: ",
addGroup("SellerAsTakerProtocol",
FXCollections.observableArrayList(Arrays.asList(
TakerVerifyMakerAccount.class,
TakerVerifyMakerFeePayment.class,
@ -156,7 +159,7 @@ public class DebugView extends InitializableView<GridPane, Void> {
SellerBroadcastPayoutTx.class,
SellerSendPayoutTxPublishedMessage.class)
));
addGroup("BuyerAsTakerProtocol: ",
addGroup("BuyerAsTakerProtocol",
FXCollections.observableArrayList(Arrays.asList(
TakerSelectArbitrator.class,
TakerSelectMediator.class,
@ -181,7 +184,7 @@ public class DebugView extends InitializableView<GridPane, Void> {
BuyerSendCounterCurrencyTransferStartedMessage.class,
BuyerSetupPayoutTxListener.class)
));
addGroup("SellerAsMakerProtocol: ",
addGroup("SellerAsMakerProtocol",
FXCollections.observableArrayList(Arrays.asList(
MakerProcessPayDepositRequest.class,
CheckIfPeerIsBanned.class,
@ -212,11 +215,12 @@ public class DebugView extends InitializableView<GridPane, Void> {
}
private void addGroup(String title, ObservableList<Class<? extends Task>> list) {
ComboBox<Class<? extends Task>> comboBox = FormBuilder.<Class<? extends Task>>addComboBox(root, ++rowIndex, title);
final Tuple2<Label, ComboBox<Class<? extends Task>>> selectTaskToIntercept =
addTopLabelComboBox(root, ++rowIndex, title, "Select task to intercept", 15);
ComboBox<Class<? extends Task>> comboBox = selectTaskToIntercept.second;
comboBox.setVisibleRowCount(list.size());
comboBox.setItems(list);
comboBox.setPromptText("Select task to intercept");
comboBox.setConverter(new StringConverter<Class<? extends Task>>() {
comboBox.setConverter(new StringConverter<>() {
@Override
public String toString(Class<? extends Task> item) {
return item.getSimpleName();

2
desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java
View File

@ -784,7 +784,7 @@ public abstract class Overlay<T extends Overlay> {
Button logButton = new AutoTooltipButton(Res.get("popup.reportError.log"));
GridPane.setMargin(logButton, new Insets(20, 0, 0, 0));
GridPane.setHalignment(logButton, HPos.RIGHT);
GridPane.setHalignment(logButton, HPos.LEFT);
GridPane.setRowIndex(logButton, ++rowIndex);
gridPane.getChildren().add(logButton);
logButton.setOnAction(event -> {

4
desktop/src/main/java/bisq/desktop/main/overlays/windows/EmptyWalletWindow.java
View File

@ -144,6 +144,10 @@ public class EmptyWalletWindow extends Overlay<EmptyWalletWindow> {
}
private void addContent() {
if (!isBtc)
gridPane.getColumnConstraints().remove(1);
if (isBtc)
addMultilineLabel(gridPane, ++rowIndex, Res.get("emptyWalletWindow.info"), 10);

4
desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java
View File

@ -119,6 +119,9 @@ public class FilterWindow extends Overlay<FilterWindow> {
}
private void addContent() {
gridPane.getColumnConstraints().remove(1);
gridPane.getColumnConstraints().get(0).setHalignment(HPos.LEFT);
InputTextField keyInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("shared.unlock"), 10);
if (useDevPrivilegeKeys)
keyInputTextField.setText(DevEnv.DEV_PRIVILEGE_PRIV_KEY);
@ -287,7 +290,6 @@ public class FilterWindow extends Overlay<FilterWindow> {
HBox hBox = new HBox();
hBox.setSpacing(10);
GridPane.setRowIndex(hBox, ++rowIndex);
GridPane.setColumnIndex(hBox, 1);
hBox.getChildren().addAll(sendButton, removeFilterMessageButton, closeButton);
gridPane.getChildren().add(hBox);
GridPane.setMargin(hBox, new Insets(10, 0, 0, 0));

34
desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java
View File

@ -20,7 +20,6 @@ package bisq.desktop.main.overlays.windows;
import bisq.desktop.components.InputTextField;
import bisq.desktop.main.overlays.Overlay;
import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.util.FormBuilder;
import bisq.desktop.util.GUIUtil;
import bisq.core.btc.exceptions.TransactionVerificationException;
@ -48,6 +47,8 @@ import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import static bisq.desktop.util.FormBuilder.addInputTextField;
// We dont translate here as it is for dev only purpose
public class ManualPayoutTxWindow extends Overlay<ManualPayoutTxWindow> {
private static final Logger log = LoggerFactory.getLogger(ManualPayoutTxWindow.class);
@ -98,27 +99,28 @@ public class ManualPayoutTxWindow extends Overlay<ManualPayoutTxWindow> {
}
private void addContent() {
gridPane.getColumnConstraints().remove(1);
// We dont translate here as it is for dev only purpose
InputTextField depositTxHex = FormBuilder.addInputTextField(gridPane, ++rowIndex, "depositTxHex:");
InputTextField depositTxHex = addInputTextField(gridPane, ++rowIndex, "depositTxHex");
InputTextField buyerPayoutAmount = FormBuilder.addInputTextField(gridPane, ++rowIndex, "buyerPayoutAmount:");
InputTextField sellerPayoutAmount = FormBuilder.addInputTextField(gridPane, ++rowIndex, "sellerPayoutAmount:");
InputTextField arbitratorPayoutAmount = FormBuilder.addInputTextField(gridPane, ++rowIndex, "arbitratorPayoutAmount:");
InputTextField txFee = FormBuilder.addInputTextField(gridPane, ++rowIndex, "Tx fee:");
InputTextField buyerPayoutAmount = addInputTextField(gridPane, ++rowIndex, "buyerPayoutAmount");
InputTextField sellerPayoutAmount = addInputTextField(gridPane, ++rowIndex, "sellerPayoutAmount");
InputTextField arbitratorPayoutAmount = addInputTextField(gridPane, ++rowIndex, "arbitratorPayoutAmount");
InputTextField txFee = addInputTextField(gridPane, ++rowIndex, "Tx fee");
InputTextField buyerAddressString = FormBuilder.addInputTextField(gridPane, ++rowIndex, "buyerAddressString:");
InputTextField sellerAddressString = FormBuilder.addInputTextField(gridPane, ++rowIndex, "sellerAddressString:");
InputTextField arbitratorAddressString = FormBuilder.addInputTextField(gridPane, ++rowIndex, "arbitratorAddressString:");
InputTextField buyerAddressString = addInputTextField(gridPane, ++rowIndex, "buyerAddressString");
InputTextField sellerAddressString = addInputTextField(gridPane, ++rowIndex, "sellerAddressString");
InputTextField arbitratorAddressString = addInputTextField(gridPane, ++rowIndex, "arbitratorAddressString");
InputTextField buyerPrivateKeyAsHex = FormBuilder.addInputTextField(gridPane, ++rowIndex, "buyerPrivateKeyAsHex:");
InputTextField sellerPrivateKeyAsHex = FormBuilder.addInputTextField(gridPane, ++rowIndex, "sellerPrivateKeyAsHex:");
InputTextField arbitratorPrivateKeyAsHex = FormBuilder.addInputTextField(gridPane, ++rowIndex, "arbitratorPrivateKeyAsHex:");
InputTextField buyerPrivateKeyAsHex = addInputTextField(gridPane, ++rowIndex, "buyerPrivateKeyAsHex");
InputTextField sellerPrivateKeyAsHex = addInputTextField(gridPane, ++rowIndex, "sellerPrivateKeyAsHex");
InputTextField arbitratorPrivateKeyAsHex = addInputTextField(gridPane, ++rowIndex, "arbitratorPrivateKeyAsHex");
InputTextField buyerPubKeyAsHex = FormBuilder.addInputTextField(gridPane, ++rowIndex, "buyerPubKeyAsHex:");
InputTextField sellerPubKeyAsHex = FormBuilder.addInputTextField(gridPane, ++rowIndex, "sellerPubKeyAsHex:");
InputTextField arbitratorPubKeyAsHex = FormBuilder.addInputTextField(gridPane, ++rowIndex, "arbitratorPubKeyAsHex:");
InputTextField buyerPubKeyAsHex = addInputTextField(gridPane, ++rowIndex, "buyerPubKeyAsHex");
InputTextField sellerPubKeyAsHex = addInputTextField(gridPane, ++rowIndex, "sellerPubKeyAsHex");
InputTextField arbitratorPubKeyAsHex = addInputTextField(gridPane, ++rowIndex, "arbitratorPubKeyAsHex");
InputTextField P2SHMultiSigOutputScript = FormBuilder.addInputTextField(gridPane, ++rowIndex, "P2SHMultiSigOutputScript:");
InputTextField P2SHMultiSigOutputScript = addInputTextField(gridPane, ++rowIndex, "P2SHMultiSigOutputScript");
// Notes:

7
desktop/src/main/java/bisq/desktop/main/overlays/windows/SendAlertMessageWindow.java
View File

@ -38,6 +38,7 @@ import javafx.scene.input.KeyCode;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javafx.geometry.HPos;
import javafx.geometry.Insets;
import static bisq.desktop.util.FormBuilder.addInputTextField;
@ -111,6 +112,9 @@ public class SendAlertMessageWindow extends Overlay<SendAlertMessageWindow> {
}
private void addContent() {
gridPane.getColumnConstraints().get(0).setHalignment(HPos.LEFT);
gridPane.getColumnConstraints().remove(1);
InputTextField keyInputTextField = addInputTextField(gridPane, ++rowIndex,
Res.get("shared.unlock"), 10);
if (useDevPrivilegeKeys)
@ -131,6 +135,8 @@ public class SendAlertMessageWindow extends Overlay<SendAlertMessageWindow> {
versionInputTextField.disableProperty().bind(isUpdateCheckBox.selectedProperty().not());
Button sendButton = new AutoTooltipButton(Res.get("sendAlertMessageWindow.send"));
sendButton.getStyleClass().add("action-button");
sendButton.setDefaultButton(true);
sendButton.setOnAction(e -> {
final String version = versionInputTextField.getText();
boolean versionOK = false;
@ -176,7 +182,6 @@ public class SendAlertMessageWindow extends Overlay<SendAlertMessageWindow> {
HBox hBox = new HBox();
hBox.setSpacing(10);
GridPane.setRowIndex(hBox, ++rowIndex);
GridPane.setColumnIndex(hBox, 1);
hBox.getChildren().addAll(sendButton, removeAlertMessageButton, closeButton);
gridPane.getChildren().add(hBox);
GridPane.setMargin(hBox, new Insets(10, 0, 0, 0));

17
desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java
View File

@ -31,6 +31,8 @@ import bisq.common.util.Utilities;
import com.google.common.base.Joiner;
import com.jfoenix.controls.JFXProgressBar;
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
@ -120,6 +122,7 @@ public class DisplayUpdateDownloadWindow extends Overlay<DisplayUpdateDownloadWi
Button downloadButton = new AutoTooltipButton(Res.get("displayUpdateDownloadWindow.button.label"));
downloadButton.getStyleClass().add("action-button");
downloadButton.setDefaultButton(true);
busyAnimation = new BusyAnimation(false);
@ -137,22 +140,18 @@ public class DisplayUpdateDownloadWindow extends Overlay<DisplayUpdateDownloadWi
GridPane.setColumnSpan(hBox, 2);
gridPane.getChildren().add(hBox);
Label downloadingFileLabel = addLabel(gridPane, ++rowIndex, Res.get("displayUpdateDownloadWindow.downloadingFile", ""));
GridPane.setColumnIndex(downloadingFileLabel, 0);
Label downloadingFileLabel = addLabel(gridPane, ++rowIndex,
Res.get("displayUpdateDownloadWindow.downloadingFile", ""));
downloadingFileLabel.setOpacity(0.2);
GridPane.setHalignment(downloadingFileLabel, HPos.LEFT);
progressBar = new ProgressBar(0L);
progressBar.setPrefWidth(200);
progressBar = new JFXProgressBar(0L);
progressBar.setMaxHeight(4);
progressBar.managedProperty().bind(progressBar.visibleProperty());
progressBar.setVisible(false);
GridPane.setRowIndex(progressBar, rowIndex);
GridPane.setColumnIndex(progressBar, 1);
GridPane.setRowIndex(progressBar, ++rowIndex);
GridPane.setHalignment(progressBar, HPos.LEFT);
GridPane.setFillWidth(progressBar, true);
GridPane.setMargin(progressBar, new Insets(3, 0, 0, 10));
gridPane.getChildren().add(progressBar);