aboutsummaryrefslogtreecommitdiff
path: root/src/qt/optionsdialog.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2014-02-15 10:38:06 +0100
committerWladimir J. van der Laan <[email protected]>2014-02-16 09:23:08 +0100
commit29d45073c969e20a36ee01c1beabace331cb8245 (patch)
treeef71851f867da05dca8a76dccddf03787c0c1dc3 /src/qt/optionsdialog.cpp
parentMerge pull request #3669 from gavinandresen/dead_txns (diff)
downloaddiscoin-29d45073c969e20a36ee01c1beabace331cb8245.tar.xz
discoin-29d45073c969e20a36ee01c1beabace331cb8245.zip
qt: Add option to (not) spend unconfirmed change
- Add a wallet tab to options dialog - Move fee setting to wallet tab - Add new setting to set -nospendzeroconfchange from UI
Diffstat (limited to 'src/qt/optionsdialog.cpp')
-rw-r--r--src/qt/optionsdialog.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index f61bb3ed2..317e1db7d 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -148,11 +148,14 @@ void OptionsDialog::setModel(OptionsModel *model)
void OptionsDialog::setMapper()
{
/* Main */
- mapper->addMapping(ui->transactionFee, OptionsModel::Fee);
mapper->addMapping(ui->bitcoinAtStartup, OptionsModel::StartAtStartup);
mapper->addMapping(ui->threadsScriptVerif, OptionsModel::ThreadsScriptVerif);
mapper->addMapping(ui->databaseCache, OptionsModel::DatabaseCache);
+ /* Wallet */
+ mapper->addMapping(ui->transactionFee, OptionsModel::Fee);
+ mapper->addMapping(ui->spendZeroConfChange, OptionsModel::SpendZeroConfChange);
+
/* Network */
mapper->addMapping(ui->mapPortUpnp, OptionsModel::MapPortUPnP);