diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-03 17:47:00 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-03 17:47:58 +0200 |
commit | 07b6c2b90168a91964f096b83f1278c312321771 (patch) | |
tree | 052340b8b4af0b0df7b607e757da4edc1b2ff101 /src/qt/optionsmodel.cpp | |
parent | 29264a0a60fb18671ab43713f168765ab7609cd6 (diff) | |
parent | 8969828d069e4e55108618a493749535edc12ec7 (diff) | |
download | bitcoin-07b6c2b90168a91964f096b83f1278c312321771.tar.xz |
Merge pull request #4302
8969828 [Qt] New status bar Unit Display Control and related changes. (gubatron)
Diffstat (limited to 'src/qt/optionsmodel.cpp')
-rw-r--r-- | src/qt/optionsmodel.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 6d985abaf8..09553a2587 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -308,9 +308,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in break; #endif case DisplayUnit: - nDisplayUnit = value.toInt(); - settings.setValue("nDisplayUnit", nDisplayUnit); - emit displayUnitChanged(nDisplayUnit); + setDisplayUnit(value); break; case DisplayAddresses: bDisplayAddresses = value.toBool(); @@ -356,11 +354,24 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in break; } } + emit dataChanged(index, index); return successful; } +/** Updates current unit in memory, settings and emits displayUnitChanged(newUnit) signal */ +void OptionsModel::setDisplayUnit(const QVariant &value) +{ + if (!value.isNull()) + { + QSettings settings; + nDisplayUnit = value.toInt(); + settings.setValue("nDisplayUnit", nDisplayUnit); + emit displayUnitChanged(nDisplayUnit); + } +} + bool OptionsModel::getProxySettings(QNetworkProxy& proxy) const { // Directly query current base proxy, because |