Browse Source

Disable the keyboard shortcut for saving PSBT binary when its parent menu is disabled

terminal
Haakon Nilsen 4 years ago
parent
commit
447e2ab264
  1. 4
      src/main/java/com/sparrowwallet/sparrow/AppController.java
  2. 2
      src/main/resources/com/sparrowwallet/sparrow/app.fxml

4
src/main/java/com/sparrowwallet/sparrow/AppController.java

@ -87,6 +87,9 @@ public class AppController implements Initializable {
@FXML
private Menu savePSBT;
@FXML
private MenuItem savePSBTBinary;
@FXML
private MenuItem exportWallet;
@ -267,6 +270,7 @@ public class AppController implements Initializable {
showLoadingLog.setSelected(Config.get().isShowLoadingLog());
showUtxosChart.setSelected(Config.get().isShowUtxosChart());
savePSBT.visibleProperty().bind(saveTransaction.visibleProperty().not());
savePSBTBinary.disableProperty().bind(saveTransaction.visibleProperty());
exportWallet.setDisable(true);
refreshWallet.disableProperty().bind(Bindings.or(exportWallet.disableProperty(), Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not())));
sendToMany.disableProperty().bind(exportWallet.disableProperty());

2
src/main/resources/com/sparrowwallet/sparrow/app.fxml

@ -29,7 +29,7 @@
</Menu>
<MenuItem fx:id="saveTransaction" mnemonicParsing="false" text="Save Transaction..." accelerator="Shortcut+S" onAction="#saveTransaction"/>
<Menu fx:id="savePSBT" mnemonicParsing="false" text="Save PSBT">
<MenuItem text="As Binary..." onAction="#savePSBTBinary" accelerator="Shortcut+S"/>
<MenuItem fx:id="savePSBTBinary" text="As Binary..." onAction="#savePSBTBinary" accelerator="Shortcut+S"/>
<MenuItem text="As Base64..." onAction="#savePSBTText"/>
<MenuItem text="As Binary (No Xpubs)..." onAction="#savePSBTBinaryNoXpubs"/>
<MenuItem text="As Base64 (No Xpubs)..." onAction="#savePSBTTextNoXpubs"/>

Loading…
Cancel
Save