aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/qt/forms/optionsdialog.ui59
-rw-r--r--src/qt/optionsdialog.cpp2
2 files changed, 30 insertions, 31 deletions
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index a555f13c2a..36b070f1c8 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -190,26 +190,6 @@
</layout>
</item>
<item>
- <widget class="QLabel" name="spendZeroConfChangeInfoLabel">
- <property name="text">
- <string>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</string>
- </property>
- <property name="textFormat">
- <enum>Qt::PlainText</enum>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="spendZeroConfChange">
- <property name="text">
- <string>&amp;Spend unconfirmed change (experts only)</string>
- </property>
- </widget>
- </item>
- <item>
<spacer name="verticalSpacer_Wallet">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -222,6 +202,35 @@
</property>
</spacer>
</item>
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Expert</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="coinControlFeatures">
+ <property name="toolTip">
+ <string>Whether to show coin control features or not.</string>
+ </property>
+ <property name="text">
+ <string>Enable coin &amp;control features</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="spendZeroConfChange">
+ <property name="toolTip">
+ <string>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</string>
+ </property>
+ <property name="text">
+ <string>&amp;Spend unconfirmed change</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tabNetwork">
@@ -469,16 +478,6 @@
</widget>
</item>
<item>
- <widget class="QCheckBox" name="coinControlFeatures">
- <property name="toolTip">
- <string>Whether to show coin control features or not.</string>
- </property>
- <property name="text">
- <string>Display coin &amp;control features (experts only)</string>
- </property>
- </widget>
- </item>
- <item>
<spacer name="verticalSpacer_Display">
<property name="orientation">
<enum>Qt::Vertical</enum>
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index e31542961c..9f7c484946 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -159,6 +159,7 @@ void OptionsDialog::setMapper()
/* Wallet */
mapper->addMapping(ui->transactionFee, OptionsModel::Fee);
mapper->addMapping(ui->spendZeroConfChange, OptionsModel::SpendZeroConfChange);
+ mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures);
/* Network */
mapper->addMapping(ui->mapPortUpnp, OptionsModel::MapPortUPnP);
@@ -178,7 +179,6 @@ void OptionsDialog::setMapper()
mapper->addMapping(ui->lang, OptionsModel::Language);
mapper->addMapping(ui->unit, OptionsModel::DisplayUnit);
mapper->addMapping(ui->displayAddresses, OptionsModel::DisplayAddresses);
- mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures);
}
void OptionsDialog::enableOkButton()