sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-04 21:36:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add utxo set replacement ui

Browse source
This commit is contained in:
Craig Raw 2021-11-12 16:46:05 +02:00
parent b8b1039ada
commit 8f04d23b3f
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/sparrowwallet/sparrow/MainApp.java
View file

@ -8,7 +8,6 @@ import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands; import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
import com.sparrowwallet.sparrow.io.Config; import com.sparrowwallet.sparrow.io.Config;
import com.sparrowwallet.sparrow.io.Storage; import com.sparrowwallet.sparrow.io.Storage;
import com.sparrowwallet.sparrow.net.Bwt;
import com.sparrowwallet.sparrow.net.PublicElectrumServer; import com.sparrowwallet.sparrow.net.PublicElectrumServer;
import com.sparrowwallet.sparrow.net.ServerType; import com.sparrowwallet.sparrow.net.ServerType;
import com.sparrowwallet.sparrow.preferences.PreferenceGroup; import com.sparrowwallet.sparrow.preferences.PreferenceGroup;

8
src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java
View file

@ -189,7 +189,7 @@ public class TransactionDiagram extends GridPane {
if(numSets > 1) { if(numSets > 1) {
double setHeight = (height / numSets) - 5; double setHeight = (height / numSets) - 5;
for(int set = 0; set < numSets; set++) { for(int set = 0; set < numSets; set++) {
StackPane stackPane = getBracket(width, setHeight, getUserGlyph(), "Contributor " + (set+1)); StackPane stackPane = getBracket(width, setHeight, getUserGlyph(), walletTx.getWallet().getFullDisplayName() + "\nClick to replace with an external contributor");
allBrackets.getChildren().add(stackPane); allBrackets.getChildren().add(stackPane);
} }
} else if(walletTx.isCoinControlUsed()) { } else if(walletTx.isCoinControlUsed()) {
@ -248,6 +248,8 @@ public class TransactionDiagram extends GridPane {
glyph.getStyleClass().add("inputs-type"); glyph.getStyleClass().add("inputs-type");
Tooltip tooltip = new Tooltip(tooltipText); Tooltip tooltip = new Tooltip(tooltipText);
tooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
tooltip.setShowDuration(Duration.INDEFINITE);
glyph.setTooltip(tooltip); glyph.setTooltip(tooltip);
stackPane.getChildren().addAll(pane, glyph); stackPane.getChildren().addAll(pane, glyph);
@ -752,9 +754,11 @@ public class TransactionDiagram extends GridPane {
} }
private Glyph getUserGlyph() { private Glyph getUserGlyph() {
Glyph userGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.USER); Glyph userGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.COINS);
userGlyph.getStyleClass().add("user-icon"); userGlyph.getStyleClass().add("user-icon");
userGlyph.setFontSize(12); userGlyph.setFontSize(12);
userGlyph.setOnMouseEntered(event -> userGlyph.setIcon(FontAwesome5.Glyph.USER_PLUS));
userGlyph.setOnMouseExited(event -> userGlyph.setIcon(FontAwesome5.Glyph.COINS));
return userGlyph; return userGlyph;
} }

1
src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java
View file

@ -72,6 +72,7 @@ public class FontAwesome5 extends GlyphFont {
UNDO('\uf0e2'), UNDO('\uf0e2'),
USER('\uf007'), USER('\uf007'),
USER_FRIENDS('\uf500'), USER_FRIENDS('\uf500'),
USER_PLUS('\uf234'),
WALLET('\uf555'), WALLET('\uf555'),
WEIGHT('\uf496'); WEIGHT('\uf496');

4
src/main/resources/com/sparrowwallet/sparrow/wallet/send.css
View file

@ -114,4 +114,8 @@
linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border), linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
linear-gradient(to bottom, derive(-fx-control-inner-background, -9%), derive(-fx-control-inner-background, 0%), derive(-fx-control-inner-background, -5%), derive(-fx-control-inner-background, -12%)), linear-gradient(to bottom, derive(-fx-control-inner-background, -9%), derive(-fx-control-inner-background, 0%), derive(-fx-control-inner-background, -5%), derive(-fx-control-inner-background, -12%)),
linear-gradient(to right, #c8416466 0%, #a0a1a766 50%, #a0a1a700 100%); linear-gradient(to right, #c8416466 0%, #a0a1a766 50%, #a0a1a700 100%);
}
#transactionDiagram .user-icon {
-fx-text-fill: -fx-text-base-color;
} }