mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 22:45:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use FormBuilder.getIcon instead of AwesomeDude.createIconLabel

Browse source
This commit is contained in:
Manfred Karrer 2018-10-23 11:58:41 -05:00
parent 501050de6f
commit 0bbafc070b
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
desktop/src/main/java/bisq/desktop/components/InfoDisplay.java
View file

@ -17,11 +17,12 @@
package bisq.desktop.components;
import bisq.desktop.util.FormBuilder;
import bisq.core.locale.Res;
import bisq.common.UserThread;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import javafx.scene.Parent;
@ -61,7 +62,7 @@ public class InfoDisplay extends Parent {
private boolean useReadMore;
private final Label icon = AwesomeDude.createIconLabel(AwesomeIcon.INFO_SIGN);
private final Label icon = FormBuilder.getIcon(AwesomeIcon.INFO_SIGN);
private final TextFlow textFlow;
private final Label label;
private final Hyperlink link;

12
desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsListItem.java
View file

@ -17,6 +17,8 @@
package bisq.desktop.main.dao.governance.proposals;
import bisq.desktop.util.FormBuilder;
import bisq.core.dao.DaoFacade;
import bisq.core.dao.governance.ballot.Ballot;
import bisq.core.dao.governance.ballot.vote.Vote;
@ -25,7 +27,6 @@ import bisq.core.dao.state.period.DaoPhase;
import bisq.core.locale.Res;
import bisq.core.util.BsqFormatter;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import javafx.scene.control.Button;
@ -120,8 +121,7 @@ public class ProposalsListItem {
//noinspection IfCanBeSwitch
Label icon;
if (phase == DaoPhase.Phase.PROPOSAL) {
//icon = AwesomeDude.createIconLabel(AwesomeIcon.TRASH);
icon = AwesomeDude.createIconLabel(AwesomeIcon.TRASH);
icon = FormBuilder.getIcon(AwesomeIcon.TRASH);
icon.getStyleClass().addAll("icon", "dao-remove-proposal-icon");
iconButton = new Button("", icon);
@ -143,18 +143,18 @@ public class ProposalsListItem {
if (vote != null) {
if ((vote).isAccepted()) {
icon = AwesomeDude.createIconLabel(AwesomeIcon.THUMBS_UP);
icon = FormBuilder.getIcon(AwesomeIcon.THUMBS_UP);
icon.getStyleClass().addAll("icon", "dao-accepted-icon");
iconButton = new Button("", icon);
iconButton.setUserData(IconButtonTypes.ACCEPT);
} else {
icon = AwesomeDude.createIconLabel(AwesomeIcon.THUMBS_DOWN);
icon = FormBuilder.getIcon(AwesomeIcon.THUMBS_DOWN);
icon.getStyleClass().addAll("icon", "dao-rejected-icon");
iconButton = new Button("", icon);
iconButton.setUserData(IconButtonTypes.REJECT);
}
} else {
icon = AwesomeDude.createIconLabel(AwesomeIcon.MINUS);
icon = FormBuilder.getIcon(AwesomeIcon.MINUS);
icon.getStyleClass().addAll("icon", "dao-ignored-icon");
iconButton = new Button("", icon);
iconButton.setUserData(IconButtonTypes.IGNORE);

9
desktop/src/main/java/bisq/desktop/main/dao/governance/result/ProposalListItem.java
View file

@ -17,6 +17,8 @@
package bisq.desktop.main.dao.governance.result;
import bisq.desktop.util.FormBuilder;
import bisq.core.dao.governance.ballot.Ballot;
import bisq.core.dao.governance.ballot.vote.Vote;
import bisq.core.dao.governance.proposal.Proposal;
@ -33,7 +35,6 @@ import bisq.core.util.BsqFormatter;
import org.bitcoinj.core.Coin;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import javafx.scene.control.Label;
@ -66,14 +67,14 @@ public class ProposalListItem {
Label myVoteIcon;
if (vote != null) {
if ((vote).isAccepted()) {
myVoteIcon = AwesomeDude.createIconLabel(AwesomeIcon.THUMBS_UP);
myVoteIcon = FormBuilder.getIcon(AwesomeIcon.THUMBS_UP);
myVoteIcon.getStyleClass().add("dao-accepted-icon");
} else {
myVoteIcon = AwesomeDude.createIconLabel(AwesomeIcon.THUMBS_DOWN);
myVoteIcon = FormBuilder.getIcon(AwesomeIcon.THUMBS_DOWN);
myVoteIcon.getStyleClass().add("dao-rejected-icon");
}
} else {
myVoteIcon = AwesomeDude.createIconLabel(AwesomeIcon.MINUS);
myVoteIcon = FormBuilder.getIcon(AwesomeIcon.MINUS);
myVoteIcon.getStyleClass().add("dao-ignored-icon");
}
return myVoteIcon;

3
desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java
View file

@ -44,7 +44,6 @@ import org.bitcoinj.core.Transaction;
import javax.inject.Inject;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import javafx.scene.control.Label;
@ -569,7 +568,7 @@ public class BsqTxView extends ActivatableView<GridPane, Void> implements BsqBal
style = "dao-tx-type-unverified-icon";
break;
}
Label label = AwesomeDude.createIconLabel(awesomeIcon);
Label label = FormBuilder.getIcon(awesomeIcon);
label.getStyleClass().addAll("icon", style);
label.setTooltip(new Tooltip(toolTipText));
if (doRotate)