sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add tor proxy prompt text

Browse source
This commit is contained in:
Craig Raw 2021-10-11 09:51:25 +02:00
parent ebd629db3a
commit ada8ca28e8
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java
View file

@ -204,6 +204,7 @@ public class ServerPreferencesController extends PreferencesDetailController {
corePort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter()); corePort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
electrumPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter()); electrumPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
proxyPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter()); proxyPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
coreProxyPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
publicProxyPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter()); publicProxyPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
coreHost.textProperty().addListener(getBitcoinCoreListener(config)); coreHost.textProperty().addListener(getBitcoinCoreListener(config));

16
src/main/resources/com/sparrowwallet/sparrow/preferences/server.fxml
View file

@ -101,8 +101,8 @@
<UnlabeledToggleSwitch fx:id="publicUseProxy"/> <UnlabeledToggleSwitch fx:id="publicUseProxy"/>
</Field> </Field>
<Field text="Proxy URL:"> <Field text="Proxy URL:">
<TextField fx:id="publicProxyHost" /> <TextField fx:id="publicProxyHost" promptText="e.g. 127.0.0.1" />
<TextField fx:id="publicProxyPort" maxWidth="100" /> <TextField fx:id="publicProxyPort" maxWidth="120" promptText="e.g. 9050/9150" />
</Field> </Field>
</Fieldset> </Fieldset>
</Form> </Form>
@ -111,7 +111,7 @@
<Fieldset inputGrow="SOMETIMES" text="Bitcoin Core RPC"> <Fieldset inputGrow="SOMETIMES" text="Bitcoin Core RPC">
<Field text="URL:"> <Field text="URL:">
<TextField fx:id="coreHost" promptText="e.g. 127.0.0.1"/> <TextField fx:id="coreHost" promptText="e.g. 127.0.0.1"/>
<TextField fx:id="corePort" promptText="e.g. 8332" maxWidth="100" /> <TextField fx:id="corePort" promptText="e.g. 8332" maxWidth="120" />
</Field> </Field>
<Field text="Authentication:"> <Field text="Authentication:">
<SegmentedButton> <SegmentedButton>
@ -148,8 +148,8 @@
<UnlabeledToggleSwitch fx:id="coreUseProxy"/><HelpLabel helpText="Bitcoin Core RPC onion URLs, and all other non-RPC external addresses will be connected via this proxy if configured." /> <UnlabeledToggleSwitch fx:id="coreUseProxy"/><HelpLabel helpText="Bitcoin Core RPC onion URLs, and all other non-RPC external addresses will be connected via this proxy if configured." />
</Field> </Field>
<Field text="Proxy URL:"> <Field text="Proxy URL:">
<TextField fx:id="coreProxyHost" /> <TextField fx:id="coreProxyHost" promptText="e.g. 127.0.0.1" />
<TextField fx:id="coreProxyPort" maxWidth="100" /> <TextField fx:id="coreProxyPort" maxWidth="120" promptText="e.g. 9050/9150" />
</Field> </Field>
</Fieldset> </Fieldset>
</Form> </Form>
@ -158,7 +158,7 @@
<Fieldset inputGrow="SOMETIMES" text="Private Electrum Server"> <Fieldset inputGrow="SOMETIMES" text="Private Electrum Server">
<Field text="URL:"> <Field text="URL:">
<TextField fx:id="electrumHost" promptText="e.g. 127.0.0.1 or Tor hostname (.onion)"/> <TextField fx:id="electrumHost" promptText="e.g. 127.0.0.1 or Tor hostname (.onion)"/>
<TextField fx:id="electrumPort" promptText="e.g. 50002" maxWidth="100" /> <TextField fx:id="electrumPort" promptText="e.g. 50002" maxWidth="120" />
</Field> </Field>
<Field text="Use SSL:"> <Field text="Use SSL:">
<UnlabeledToggleSwitch fx:id="electrumUseSsl"/> <UnlabeledToggleSwitch fx:id="electrumUseSsl"/>
@ -175,8 +175,8 @@
<UnlabeledToggleSwitch fx:id="useProxy"/><HelpLabel helpText="All external addresses will be connected via this proxy if configured." /> <UnlabeledToggleSwitch fx:id="useProxy"/><HelpLabel helpText="All external addresses will be connected via this proxy if configured." />
</Field> </Field>
<Field text="Proxy URL:"> <Field text="Proxy URL:">
<TextField fx:id="proxyHost" /> <TextField fx:id="proxyHost" promptText="e.g. 127.0.0.1" />
<TextField fx:id="proxyPort" maxWidth="100" /> <TextField fx:id="proxyPort" maxWidth="120" promptText="e.g. 9050/9150" />
</Field> </Field>
</Fieldset> </Fieldset>
</Form> </Form>