diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountModel.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountModel.java index 167dc98d65..c2edd19365 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountModel.java @@ -66,10 +66,9 @@ class IrcAccountModel extends UIModel { final ObjectProperty type = new SimpleObjectProperty<>(); final ObjectProperty currency = new SimpleObjectProperty<>(); - final ObservableList allTypes = FXCollections.observableArrayList(BankAccountType - .getAllBankAccountTypes()); - final ObservableList allCurrencies = FXCollections.observableArrayList(CurrencyUtil - .getAllCurrencies()); + final ObservableList allTypes = + FXCollections.observableArrayList(BankAccountType.getAllBankAccountTypes()); + final ObservableList allCurrencies = FXCollections.observableArrayList(CurrencyUtil.getAllCurrencies()); final ObservableList allBankAccounts = FXCollections.observableArrayList(); diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java index 6a632ce989..08cf21f10d 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java @@ -74,14 +74,10 @@ public class IrcAccountViewCB extends CachedViewCB implements Cont @Override public void initialize(URL url, ResourceBundle rb) { - typesComboBox.setItems(presentationModel.getAllTypes()); - typesComboBox.setConverter(presentationModel.getTypesConverter()); - - currencyComboBox.setItems(presentationModel.getAllCurrencies()); - currencyComboBox.setConverter(presentationModel.getCurrencyConverter()); - ircNickNameTextField.setValidator(presentationModel.getNickNameValidator()); + typesComboBox.setItems(presentationModel.getAllTypes()); + typesComboBox.setConverter(presentationModel.getTypesConverter()); // we use a custom cell for deactivating non IRC items, later we use the standard cell and the StringConverter typesComboBox.setCellFactory(new Callback, ListCell>() { @Override @@ -105,9 +101,37 @@ public class IrcAccountViewCB extends CachedViewCB implements Cont }; } }); - typesComboBox.getSelectionModel().select(0); + currencyComboBox.setItems(presentationModel.getAllCurrencies()); + currencyComboBox.setConverter(presentationModel.getCurrencyConverter()); + // we use a custom cell for deactivating non EUR items, later we use the standard cell and the StringConverter + currencyComboBox.setCellFactory(new Callback, ListCell>() { + @Override + public ListCell call(ListView p) { + return new ListCell() { + + @Override + protected void updateItem(Currency currency, boolean empty) { + super.updateItem(currency, empty); + + if (currency == null || empty) { + setGraphic(null); + } + else { + setText(currency.getCurrencyCode() + " (" + currency.getDisplayName() + ")"); + + if (!currency.getCurrencyCode().equals("EUR")) { + setOpacity(0.3); + setDisable(true); + } + } + } + }; + } + }); + currencyComboBox.getSelectionModel().select(0); + super.initialize(url, rb); } diff --git a/src/main/java/io/bitsquare/locale/CurrencyUtil.java b/src/main/java/io/bitsquare/locale/CurrencyUtil.java index 4ecf643f04..45d294ff8c 100644 --- a/src/main/java/io/bitsquare/locale/CurrencyUtil.java +++ b/src/main/java/io/bitsquare/locale/CurrencyUtil.java @@ -17,8 +17,6 @@ package io.bitsquare.locale; -import java.text.NumberFormat; - import java.util.ArrayList; import java.util.Currency; import java.util.List; @@ -29,8 +27,8 @@ public class CurrencyUtil { public static List getAllCurrencies() { final ArrayList mainCurrencies = new ArrayList<>(); - mainCurrencies.add(Currency.getInstance("USD")); mainCurrencies.add(Currency.getInstance("EUR")); + mainCurrencies.add(Currency.getInstance("USD")); mainCurrencies.add(Currency.getInstance("CNY")); mainCurrencies.add(Currency.getInstance("RUB")); mainCurrencies.add(Currency.getInstance("JPY")); @@ -57,6 +55,8 @@ public class CurrencyUtil { } public static Currency getDefaultCurrency() { - return NumberFormat.getNumberInstance(Locale.getDefault()).getCurrency(); + // TODO Only display EUR for the moment + return Currency.getInstance("EUR"); + // NumberFormat.getNumberInstance(Locale.getDefault()).getCurrency(); } }