Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-10 23:50:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

replace 'btc' with 'xmr' in protobuf definition

Browse source
This commit is contained in:
woodser 2023-07-31 10:53:31 -04:00
parent 2a3c52b943
commit 141f1fd2db
20 changed files with 68 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

16
desktop/src/main/java/haveno/desktop/main/overlays/windows/FilterWindow.java
View file

@ -139,16 +139,16 @@ public class FilterWindow extends Overlay<FilterWindow> {
Res.get("filterWindow.mediators"));
InputTextField refundAgentsTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.refundAgents"));
InputTextField btcFeeReceiverAddressesTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.btcFeeReceiverAddresses"));
InputTextField xmrFeeReceiverAddressesTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.xmrFeeReceiverAddresses"));
InputTextField seedNodesTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.seedNode"));
InputTextField priceRelayNodesTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.priceRelayNode"));
InputTextField xmrNodesTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.xmrNode"));
CheckBox preventPublicBtcNetworkCheckBox = addLabelCheckBox(gridPane, ++rowIndex,
Res.get("filterWindow.preventPublicBtcNetwork"));
CheckBox preventPublicXmrNetworkCheckBox = addLabelCheckBox(gridPane, ++rowIndex,
Res.get("filterWindow.preventPublicXmrNetwork"));
CheckBox disableAutoConfCheckBox = addLabelCheckBox(gridPane, ++rowIndex,
Res.get("filterWindow.disableAutoConf"));
InputTextField disableTradeBelowVersionTF = addInputTextField(gridPane, ++rowIndex,
@ -174,14 +174,14 @@ public class FilterWindow extends Overlay<FilterWindow> {
setupFieldFromList(arbitratorsTF, filter.getArbitrators());
setupFieldFromList(mediatorsTF, filter.getMediators());
setupFieldFromList(refundAgentsTF, filter.getRefundAgents());
setupFieldFromList(btcFeeReceiverAddressesTF, filter.getBtcFeeReceiverAddresses());
setupFieldFromList(xmrFeeReceiverAddressesTF, filter.getXmrFeeReceiverAddresses());
setupFieldFromList(seedNodesTF, filter.getSeedNodes());
setupFieldFromList(priceRelayNodesTF, filter.getPriceRelayNodes());
setupFieldFromList(xmrNodesTF, filter.getXmrNodes());
setupFieldFromList(bannedPrivilegedDevPubKeysTF, filter.getBannedPrivilegedDevPubKeys());
setupFieldFromList(autoConfExplorersTF, filter.getBannedAutoConfExplorers());
preventPublicBtcNetworkCheckBox.setSelected(filter.isPreventPublicBtcNetwork());
preventPublicXmrNetworkCheckBox.setSelected(filter.isPreventPublicXmrNetwork());
disableAutoConfCheckBox.setSelected(filter.isDisableAutoConf());
disableTradeBelowVersionTF.setText(filter.getDisableTradeBelowVersion());
disableMempoolValidationCheckBox.setSelected(filter.isDisableMempoolValidation());
@ -205,13 +205,13 @@ public class FilterWindow extends Overlay<FilterWindow> {
readAsList(arbitratorsTF),
readAsList(seedNodesTF),
readAsList(priceRelayNodesTF),
preventPublicBtcNetworkCheckBox.isSelected(),
preventPublicXmrNetworkCheckBox.isSelected(),
readAsList(xmrNodesTF),
disableTradeBelowVersionTF.getText(),
readAsList(mediatorsTF),
readAsList(refundAgentsTF),
readAsList(bannedAccountWitnessSignerPubKeysTF),
readAsList(btcFeeReceiverAddressesTF),
readAsList(xmrFeeReceiverAddressesTF),
filterManager.getOwnerPubKey(),
signerPubKeyAsHex,
readAsList(bannedPrivilegedDevPubKeysTF),

14
desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java
View file

@ -251,7 +251,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
showShutDownPopup();
}
};
filterPropertyListener = (observable, oldValue, newValue) -> applyPreventPublicBtcNetwork();
filterPropertyListener = (observable, oldValue, newValue) -> applyPreventPublicXmrNetwork();
//TODO sorting needs other NetworkStatisticListItem as columns type
/* creationDateColumn.setComparator((o1, o2) ->
@ -267,7 +267,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
moneroPeersToggleGroup.selectedToggleProperty().addListener(moneroPeersToggleGroupListener);
if (filterManager.getFilter() != null)
applyPreventPublicBtcNetwork();
applyPreventPublicXmrNetwork();
filterManager.filterProperty().addListener(filterPropertyListener);
@ -358,7 +358,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
private boolean isPreventPublicXmrNetwork() {
return filterManager.getFilter() != null &&
filterManager.getFilter().isPreventPublicBtcNetwork();
filterManager.getFilter().isPreventPublicXmrNetwork();
}
private void selectMoneroPeersToggle() {
@ -450,10 +450,10 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
}
private void applyPreventPublicBtcNetwork() {
final boolean preventPublicBtcNetwork = isPreventPublicXmrNetwork();
usePublicNodesRadio.setDisable(localBitcoinNode.shouldBeUsed() || preventPublicBtcNetwork);
if (preventPublicBtcNetwork && selectedMoneroNodesOption == XmrNodes.MoneroNodesOption.PUBLIC) {
private void applyPreventPublicXmrNetwork() {
final boolean preventPublicXmrNetwork = isPreventPublicXmrNetwork();
usePublicNodesRadio.setDisable(localBitcoinNode.shouldBeUsed() || preventPublicXmrNetwork);
if (preventPublicXmrNetwork && selectedMoneroNodesOption == XmrNodes.MoneroNodesOption.PUBLIC) {
selectedMoneroNodesOption = XmrNodes.MoneroNodesOption.PROVIDED;
preferences.setMoneroNodesOptionOrdinal(selectedMoneroNodesOption.ordinal());
selectMoneroPeersToggle();