laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-08-10 00:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

finalize form ui change

Browse Source
This commit is contained in:
Craig Raw
2020-07-27 14:10:22 +02:00
parent b8edfd9731
commit 62618e5da5
3 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java
+18 -5
View File
@@ -21,6 +21,7 @@ import javafx.fxml.Initializable;
import javafx.scene.control.*;
import javafx.scene.input.Clipboard;
import javafx.scene.input.ClipboardContent;
import javafx.scene.layout.VBox;
import javafx.stage.FileChooser;
import javafx.stage.Stage;
import org.controlsfx.glyphfont.Glyph;
@@ -116,7 +117,7 @@ public class HeadersController extends TransactionFormController implements Init
private IdLabel blockHash;
@FXML
private Form finalizeForm;
private Form signingWalletForm;
@FXML
private ComboBox<Wallet> signingWallet;
@@ -127,9 +128,15 @@ public class HeadersController extends TransactionFormController implements Init
@FXML
private Hyperlink noWalletsWarningLink;
@FXML
private Form sigHashForm;
@FXML
private ComboBox<SigHash> sigHash;
@FXML
private VBox finalizeButtonBox;
@FXML
private Button finalizeTransaction;
@@ -275,12 +282,18 @@ public class HeadersController extends TransactionFormController implements Init
}
blockchainForm.managedProperty().bind(blockchainForm.visibleProperty());
finalizeForm.managedProperty().bind(finalizeForm.visibleProperty());
signingWalletForm.managedProperty().bind(signingWalletForm.visibleProperty());
sigHashForm.managedProperty().bind(sigHashForm.visibleProperty());
sigHashForm.visibleProperty().bind(signingWalletForm.visibleProperty());
finalizeButtonBox.managedProperty().bind(finalizeButtonBox.visibleProperty());
finalizeButtonBox.visibleProperty().bind(signingWalletForm.visibleProperty());
signaturesForm.managedProperty().bind(signaturesForm.visibleProperty());
broadcastForm.managedProperty().bind(broadcastForm.visibleProperty());
blockchainForm.setVisible(false);
finalizeForm.setVisible(false);
signingWalletForm.setVisible(false);
signaturesForm.setVisible(false);
broadcastForm.setVisible(false);
@@ -291,7 +304,7 @@ public class HeadersController extends TransactionFormController implements Init
PSBT psbt = headersForm.getPsbt();
if(headersForm.isEditable()) {
finalizeForm.setVisible(true);
signingWalletForm.setVisible(true);
} else if(headersForm.getPsbt().isSigned()) {
broadcastForm.setVisible(true);
} else {
@@ -622,7 +635,7 @@ public class HeadersController extends TransactionFormController implements Init
headersForm.setSigningWallet(event.getSigningWallet());
finalizeForm.setVisible(false);
signingWalletForm.setVisible(false);
signaturesForm.setVisible(true);
}
}