tweak help copy and ui

This commit is contained in:
Craig Raw 2020-10-06 14:50:25 +02:00
parent 639e145672
commit 3c6adafc15
5 changed files with 13 additions and 9 deletions

View file

@ -36,7 +36,7 @@ public class HelpLabel extends Label {
private StringProperty helpText; private StringProperty helpText;
public final void setHelpText(String value) { public final void setHelpText(String value) {
helpTextProperty().setValue(value); helpTextProperty().setValue(value.replace("\\n", "\n"));
} }
public final String getHelpText() { public final String getHelpText() {

View file

@ -81,6 +81,10 @@
-fx-bar-fill: rgba(135, 138, 149, 0.5); -fx-bar-fill: rgba(135, 138, 149, 0.5);
} }
.root .titled-description-pane .status-error .text, .root .titled-description-pane .description-error .text {
-fx-fill: #e06c75;
}
#inputsPie .default-color0.chart-pie { #inputsPie .default-color0.chart-pie {
-fx-pie-color: #e06c75; -fx-pie-color: #e06c75;
} }

View file

@ -39,7 +39,7 @@
</FXCollections> </FXCollections>
</items> </items>
</ComboBox> </ComboBox>
<HelpLabel helpText="Display unit for bitcoin amounts. Auto displays amounts over 1 BTC in BTC, and amounts under in satoshis"/> <HelpLabel helpText="Display unit for bitcoin amounts.\nAuto displays amounts over 1 BTC in BTC, and amounts under that in satoshis."/>
</Field> </Field>
</Fieldset> </Fieldset>
<Fieldset inputGrow="SOMETIMES" text="Fiat" styleClass="wideLabelFieldSet"> <Fieldset inputGrow="SOMETIMES" text="Fiat" styleClass="wideLabelFieldSet">
@ -61,21 +61,21 @@
<Fieldset inputGrow="SOMETIMES" text="Coin Selection" styleClass="wideLabelFieldSet"> <Fieldset inputGrow="SOMETIMES" text="Coin Selection" styleClass="wideLabelFieldSet">
<Field text="Group by address:"> <Field text="Group by address:">
<UnlabeledToggleSwitch fx:id="groupByAddress" /> <UnlabeledToggleSwitch fx:id="groupByAddress" />
<HelpLabel helpText="Group UTXOs by address when sending to improve privacy by only sending from an address once"/> <HelpLabel helpText="Group UTXOs by address when sending to improve privacy by only sending from an address once."/>
</Field> </Field>
<Field text="Use mempool change:"> <Field text="Use mempool change:">
<UnlabeledToggleSwitch fx:id="includeMempoolChange" /> <UnlabeledToggleSwitch fx:id="includeMempoolChange" />
<HelpLabel helpText="Allow a wallet to spend UTXOs that are still in the mempool where all their inputs are from that wallet"/> <HelpLabel helpText="Allow a wallet to spend UTXOs that are still in the mempool where all their inputs are from that wallet."/>
</Field> </Field>
</Fieldset> </Fieldset>
<Fieldset inputGrow="SOMETIMES" text="Notifications" styleClass="wideLabelFieldSet"> <Fieldset inputGrow="SOMETIMES" text="Notifications" styleClass="wideLabelFieldSet">
<Field text="New transactions:"> <Field text="New transactions:">
<UnlabeledToggleSwitch fx:id="notifyNewTransactions" /> <UnlabeledToggleSwitch fx:id="notifyNewTransactions" />
<HelpLabel helpText="Show system notifications on new wallet transactions"/> <HelpLabel helpText="Show system notifications on new wallet transactions?"/>
</Field> </Field>
<Field text="Software updates:"> <Field text="Software updates:">
<UnlabeledToggleSwitch fx:id="checkNewVersions" /> <UnlabeledToggleSwitch fx:id="checkNewVersions" />
<HelpLabel helpText="Check for updates to Sparrow"/> <HelpLabel helpText="Check for updates to Sparrow?"/>
</Field> </Field>
</Fieldset> </Fieldset>
</Form> </Form>

View file

@ -28,7 +28,7 @@
<Fieldset inputGrow="SOMETIMES" text="Advanced Settings" styleClass="wideLabelFieldSet"> <Fieldset inputGrow="SOMETIMES" text="Advanced Settings" styleClass="wideLabelFieldSet">
<Field text="Gap limit:"> <Field text="Gap limit:">
<Spinner fx:id="gapLimit" editable="true" prefWidth="90" /> <Spinner fx:id="gapLimit" editable="true" prefWidth="90" />
<HelpLabel helpText="Change how far ahead to look for additional transactions beyond the highest derivation with previous transaction outputs"/> <HelpLabel helpText="Change how far ahead to look for additional transactions beyond the highest derivation with previous transaction outputs."/>
</Field> </Field>
</Fieldset> </Fieldset>
</Form> </Form>

View file

@ -41,10 +41,10 @@
<TextField fx:id="label" maxWidth="160"/> <TextField fx:id="label" maxWidth="160"/>
</Field> </Field>
<Field text="Master fingerprint:"> <Field text="Master fingerprint:">
<TextField fx:id="fingerprint" maxWidth="80" promptText="00000000"/> <HelpLabel helpText="A master fingerprint is the first 4 bytes of the master public key hash. It is safe to use any valid value (00000000) for Watch Only Wallets." /> <TextField fx:id="fingerprint" maxWidth="80" promptText="00000000"/> <HelpLabel helpText="A master fingerprint is the first 4 bytes of the master public key hash.\nIt is safe to use any valid value (00000000) for Watch Only Wallets." />
</Field> </Field>
<Field text="Derivation:"> <Field text="Derivation:">
<TextField fx:id="derivation" maxWidth="200"/> <HelpLabel helpText="The derivation path to the xPub from the master private key. For safety, derivations that match defaults for other script types are not valid." /> <TextField fx:id="derivation" maxWidth="200"/> <HelpLabel helpText="The derivation path to the xPub from the master private key.\nFor safety, derivations that match defaults for other script types are not valid." />
</Field> </Field>
<Field fx:id="xpubField" text="xPub:"> <Field fx:id="xpubField" text="xPub:">
<TextArea fx:id="xpub" wrapText="true" prefRowCount="2" maxHeight="52" /> <TextArea fx:id="xpub" wrapText="true" prefRowCount="2" maxHeight="52" />