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

Merge pull request #699 from riclas/getcurrencylistsymbol

Browse source 
create a getter for the GUI symbols of trade currencies
This commit is contained in:
Manfred Karrer 2016-11-13 22:24:11 +01:00 • committed by GitHub
commit 54bbf54c64
5 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/main/java/io/bitsquare/locale/CryptoCurrency.java
View file

@ -40,4 +40,9 @@ public final class CryptoCurrency extends TradeCurrency {
public boolean isAsset() {
return isAsset;
}
@Override
public String getGUISymbol() {
return "✦ ";
}
}

5
core/src/main/java/io/bitsquare/locale/FiatCurrency.java
View file

@ -41,6 +41,11 @@ public final class FiatCurrency extends TradeCurrency {
public Currency getCurrency() {
return currency;
}
@Override
public String getGUISymbol() {
return "★ ";
}
@Override
public String toString() {

4
core/src/main/java/io/bitsquare/locale/TradeCurrency.java
View file

@ -57,6 +57,10 @@ public abstract class TradeCurrency implements Persistable, Comparable<TradeCurr
public String getSymbol() {
return symbol;
}
public String getGUISymbol() {
return "-";
}
public String getNameAndCode() {
return name + " (" + code + ")";

7
gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.java
View file

@ -145,12 +145,7 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Activatab
@Override
public String toString(TradeCurrency tradeCurrency) {
// http://boschista.deviantart.com/journal/Cool-ASCII-Symbols-214218618
if (tradeCurrency instanceof FiatCurrency)
return "★ " + tradeCurrency.getNameAndCode();
else if (tradeCurrency instanceof CryptoCurrency)
return "✦ " + tradeCurrency.getNameAndCode();
else
return "-";
return tradeCurrency.getGUISymbol() + tradeCurrency.getNameAndCode();
}
@Override

14
gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
View file

@ -193,12 +193,7 @@ public class GUIUtil {
String displayString = CurrencyUtil.getNameByCode(code) + " (" + code + ")";
if (preferences.getSortMarketCurrenciesNumerically())
displayString += " - " + item.numTrades + " " + postFix;
if (tradeCurrency instanceof FiatCurrency)
return "★ " + displayString;
else if (tradeCurrency instanceof CryptoCurrency) {
return "✦ " + displayString;
} else
return "-";
return tradeCurrency.getGUISymbol() + displayString;
}
}
@ -220,12 +215,7 @@ public class GUIUtil {
return "▶ Show all";
else if (code.equals(GUIUtil.EDIT_FLAG))
return "▼ Edit currency list";
else if (tradeCurrency instanceof FiatCurrency)
return "★ " + displayString;
else if (tradeCurrency instanceof CryptoCurrency) {
return "✦ " + displayString;
} else
return "-";
return tradeCurrency.getGUISymbol() + displayString;
}
@Override