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

Fix missing setter in preferences

Browse source
This commit is contained in:
Manfred Karrer 2017-06-22 00:30:02 +02:00
parent 9acbcb682f
commit 2664e90aaf
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/main/java/io/bisq/core/user/Preferences.java
View file

@ -158,7 +158,10 @@ public final class Preferences implements PersistedDataHost {
prefPayload = persisted; prefPayload = persisted;
GlobalSettings.setLocale(new Locale(prefPayload.getUserLanguage(), prefPayload.getUserCountry().code)); GlobalSettings.setLocale(new Locale(prefPayload.getUserLanguage(), prefPayload.getUserCountry().code));
GlobalSettings.setUseAnimations(prefPayload.isUseAnimations()); GlobalSettings.setUseAnimations(prefPayload.isUseAnimations());
checkNotNull(prefPayload.getPreferredTradeCurrency(), "preferredTradeCurrency must not be null"); // move to payload? setPreferredTradeCurrency(checkNotNull(prefPayload.getPreferredTradeCurrency(), "preferredTradeCurrency must not be null"));
setFiatCurrencies(prefPayload.getFiatCurrencies());
setCryptoCurrencies(prefPayload.getCryptoCurrencies());
} else { } else {
prefPayload = new PreferencesPayload(); prefPayload = new PreferencesPayload();
prefPayload.setUserLanguage(GlobalSettings.getLocale().getLanguage()); prefPayload.setUserLanguage(GlobalSettings.getLocale().getLanguage());

2
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
View file

@ -195,7 +195,7 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
UserThread.runAfter(() -> { UserThread.runAfter(() -> {
amount.set("0.001"); amount.set("0.001");
minAmount.set(amount.get()); minAmount.set(amount.get());
price.set("0.001"); price.set("2500");
onFocusOutPriceAsPercentageTextField(true, false); onFocusOutPriceAsPercentageTextField(true, false);
applyMakerFee(); applyMakerFee();
updateButtonDisableState(); updateButtonDisableState();

1
gui/src/main/java/io/bisq/gui/main/settings/about/AboutView.java
View file

@ -43,6 +43,7 @@ public class AboutView extends ActivatableViewAndModel<GridPane, Activatable> {
super(); super();
} }
@Override
public void initialize() { public void initialize() {
TitledGroupBg titledGroupBg = addTitledGroupBg(root, gridRow, 4, Res.get("setting.about.aboutBisq")); TitledGroupBg titledGroupBg = addTitledGroupBg(root, gridRow, 4, Res.get("setting.about.aboutBisq"));
GridPane.setColumnSpan(titledGroupBg, 2); GridPane.setColumnSpan(titledGroupBg, 2);

22
gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java
View file

@ -78,14 +78,14 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Activatab
private ComboBox<CryptoCurrency> cryptoCurrenciesComboBox; private ComboBox<CryptoCurrency> cryptoCurrenciesComboBox;
private Button resetDontShowAgainButton; private Button resetDontShowAgainButton;
// private ListChangeListener<TradeCurrency> displayCurrenciesListChangeListener; // private ListChangeListener<TradeCurrency> displayCurrenciesListChangeListener;
final ObservableList<BlockChainExplorer> blockExplorers; private ObservableList<BlockChainExplorer> blockExplorers;
final ObservableList<String> languageCodes; private ObservableList<String> languageCodes;
final ObservableList<Country> countries; private ObservableList<Country> countries;
public final ObservableList<FiatCurrency> fiatCurrencies; private ObservableList<FiatCurrency> fiatCurrencies;
public final ObservableList<FiatCurrency> allFiatCurrencies; private ObservableList<FiatCurrency> allFiatCurrencies;
public final ObservableList<CryptoCurrency> cryptoCurrencies; private ObservableList<CryptoCurrency> cryptoCurrencies;
public final ObservableList<CryptoCurrency> allCryptoCurrencies; private ObservableList<CryptoCurrency> allCryptoCurrencies;
public final ObservableList<TradeCurrency> tradeCurrencies; private ObservableList<TradeCurrency> tradeCurrencies;
private InputTextField deviationInputTextField; private InputTextField deviationInputTextField;
private ChangeListener<String> deviationListener, ignoreTradersListListener; private ChangeListener<String> deviationListener, ignoreTradersListListener;
private ChangeListener<Boolean> deviationFocusedListener; private ChangeListener<Boolean> deviationFocusedListener;
@ -102,7 +102,10 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Activatab
this.preferences = preferences; this.preferences = preferences;
this.feeService = feeService; this.feeService = feeService;
this.formatter = formatter; this.formatter = formatter;
}
@Override
public void initialize() {
blockExplorers = FXCollections.observableArrayList(preferences.getBlockChainExplorers()); blockExplorers = FXCollections.observableArrayList(preferences.getBlockChainExplorers());
languageCodes = FXCollections.observableArrayList(LanguageUtil.getUserLanguageCodes()); languageCodes = FXCollections.observableArrayList(LanguageUtil.getUserLanguageCodes());
countries = FXCollections.observableArrayList(CountryUtil.getAllCountries()); countries = FXCollections.observableArrayList(CountryUtil.getAllCountries());
@ -115,10 +118,7 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Activatab
allFiatCurrencies.removeAll(fiatCurrencies); allFiatCurrencies.removeAll(fiatCurrencies);
allCryptoCurrencies.removeAll(cryptoCurrencies); allCryptoCurrencies.removeAll(cryptoCurrencies);
}
@Override
public void initialize() {
initializeGeneralOptions(); initializeGeneralOptions();
initializeDisplayCurrencies(); initializeDisplayCurrencies();
initializeDisplayOptions(); initializeDisplayOptions();