lukechilds
/
sparrow
mirror of https://github.com/lukechilds/sparrow.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

add tor proxy prompt text

terminal
Craig Raw 3 years ago
parent
ebd629db3a
commit
ada8ca28e8
2 changed files with 9 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java
  2. 16
      src/main/resources/com/sparrowwallet/sparrow/preferences/server.fxml

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());
electrumPort.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());
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"/>
</Field>
<Field text="Proxy URL:">
<TextField fx:id="publicProxyHost" />
<TextField fx:id="publicProxyPort" maxWidth="100" />
<TextField fx:id="publicProxyHost" promptText="e.g. 127.0.0.1" />
<TextField fx:id="publicProxyPort" maxWidth="120" promptText="e.g. 9050/9150" />
</Field>
</Fieldset>
</Form>
@ -111,7 +111,7 @@
<Fieldset inputGrow="SOMETIMES" text="Bitcoin Core RPC">
<Field text="URL:">
<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 text="Authentication:">
<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." />
</Field>
<Field text="Proxy URL:">
<TextField fx:id="coreProxyHost" />
<TextField fx:id="coreProxyPort" maxWidth="100" />
<TextField fx:id="coreProxyHost" promptText="e.g. 127.0.0.1" />
<TextField fx:id="coreProxyPort" maxWidth="120" promptText="e.g. 9050/9150" />
</Field>
</Fieldset>
</Form>
@ -158,7 +158,7 @@
<Fieldset inputGrow="SOMETIMES" text="Private Electrum Server">
<Field text="URL:">
<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 text="Use SSL:">
<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." />
</Field>
<Field text="Proxy URL:">
<TextField fx:id="proxyHost" />
<TextField fx:id="proxyPort" maxWidth="100" />
<TextField fx:id="proxyHost" promptText="e.g. 127.0.0.1" />
<TextField fx:id="proxyPort" maxWidth="120" promptText="e.g. 9050/9150" />
</Field>
</Fieldset>
</Form>

Write Preview
Loading…
Cancel
Save