From 111e4ccf370e885cbc4d04ea707b650c12b0ab06 Mon Sep 17 00:00:00 2001 From: Thauan Amorim Date: Mon, 10 Feb 2025 17:51:15 -0300 Subject: [PATCH] [feature/1630] Button positioning improvements --- .../sparrow/control/QRDisplayDialog.java | 4 +++ .../transaction/HeadersController.java | 35 +++++++++---------- .../sparrow/transaction/headers.fxml | 10 +++--- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java index c6137cc9..0b81e0c1 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java @@ -191,6 +191,10 @@ public class QRDisplayDialog extends Dialog { setResultConverter(dialogButton -> dialogButton); } + public static QRDisplayDialog of(UR ur, BBQR bbqr, boolean addLegacyEncodingOption, boolean addScanButton, boolean selectBbqrButton) { + return new QRDisplayDialog(ur, bbqr, addLegacyEncodingOption, addScanButton, selectBbqrButton); + } + private int getQRSize() { return AppServices.isReducedWindowHeight() ? REDUCED_QR_SIZE : DEFAULT_QR_SIZE; } diff --git a/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java b/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java index 1e36c6b2..4ddee11c 100644 --- a/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java +++ b/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java @@ -229,10 +229,10 @@ public class HeadersController extends TransactionFormController implements Init private Button broadcastButton; @FXML - private Button saveFinalButton; + private Button showTransactionButton; @FXML - private Button showTransactionButton; + private Button saveFinalButton; @FXML private Button payjoinButton; @@ -465,10 +465,10 @@ public class HeadersController extends TransactionFormController implements Init broadcastProgressBar.visibleProperty().bind(signaturesProgressBar.visibleProperty().not()); broadcastButton.managedProperty().bind(broadcastButton.visibleProperty()); - saveFinalButton.managedProperty().bind(saveFinalButton.visibleProperty()); - saveFinalButton.visibleProperty().bind(broadcastButton.visibleProperty().not()); showTransactionButton.managedProperty().bind(showTransactionButton.visibleProperty()); showTransactionButton.visibleProperty().bind(broadcastButton.visibleProperty().not()); + saveFinalButton.managedProperty().bind(saveFinalButton.visibleProperty()); + saveFinalButton.visibleProperty().bind(broadcastButton.visibleProperty().not()); broadcastButton.visibleProperty().bind(AppServices.onlineProperty()); BitcoinURI payjoinURI = getPayjoinURI(); @@ -1261,6 +1261,19 @@ public class HeadersController extends TransactionFormController implements Init broadcastTransactionService.start(); } + public void showTransaction(ActionEvent event) { + try { + Transaction transaction = headersForm.getPsbt().extractTransaction(); + byte[] txBytes = transaction.bitcoinSerialize(); + UR ur = UR.fromBytes(txBytes); + BBQR bbqr = new BBQR(BBQRType.TXN, txBytes); + QRDisplayDialog.of(ur, bbqr, false, false, false).showAndWait(); + } catch (Exception exception) { + log.error("Error creating UR", exception); + AppServices.showErrorDialog("Error displaying transaction QR code", exception.getMessage()); + } + } + public void saveFinalTransaction(ActionEvent event) { Stage window = new Stage(); @@ -1286,20 +1299,6 @@ public class HeadersController extends TransactionFormController implements Init } } - public void showTransaction(ActionEvent event) { - try { - Transaction transaction = headersForm.getPsbt().extractTransaction(); - byte[] txBytes = transaction.bitcoinSerialize(); - UR ur = UR.fromBytes(txBytes); - BBQR bbqr = new BBQR(BBQRType.TXN, txBytes); - QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, false, false); - qrDisplayDialog.showAndWait(); - } catch (Exception exception) { - log.error("Error creating UR", exception); - AppServices.showErrorDialog("Error displaying transaction QR code", exception.getMessage()); - } - } - public void getPayjoinTransaction(ActionEvent event) { BitcoinURI payjoinURI = getPayjoinURI(); if(payjoinURI == null) { diff --git a/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.fxml b/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.fxml index c7e26af0..b1cfdcbd 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.fxml @@ -285,6 +285,11 @@ + -