Merge pull request #3850

16d281b [Qt] add expert section to wallet tab in optionsdialog (Cozz Lovan)
This commit is contained in:
Wladimir J. van der Laan 2014-03-21 09:26:22 +01:00
commit be0afe238b
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 30 additions and 31 deletions

View file

@ -189,26 +189,6 @@
</item> </item>
</layout> </layout>
</item> </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> <item>
<spacer name="verticalSpacer_Wallet"> <spacer name="verticalSpacer_Wallet">
<property name="orientation"> <property name="orientation">
@ -222,6 +202,35 @@
</property> </property>
</spacer> </spacer>
</item> </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> </layout>
</widget> </widget>
<widget class="QWidget" name="tabNetwork"> <widget class="QWidget" name="tabNetwork">
@ -468,16 +477,6 @@
</property> </property>
</widget> </widget>
</item> </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> <item>
<spacer name="verticalSpacer_Display"> <spacer name="verticalSpacer_Display">
<property name="orientation"> <property name="orientation">

View file

@ -159,6 +159,7 @@ void OptionsDialog::setMapper()
/* Wallet */ /* Wallet */
mapper->addMapping(ui->transactionFee, OptionsModel::Fee); mapper->addMapping(ui->transactionFee, OptionsModel::Fee);
mapper->addMapping(ui->spendZeroConfChange, OptionsModel::SpendZeroConfChange); mapper->addMapping(ui->spendZeroConfChange, OptionsModel::SpendZeroConfChange);
mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures);
/* Network */ /* Network */
mapper->addMapping(ui->mapPortUpnp, OptionsModel::MapPortUPnP); mapper->addMapping(ui->mapPortUpnp, OptionsModel::MapPortUPnP);
@ -178,7 +179,6 @@ void OptionsDialog::setMapper()
mapper->addMapping(ui->lang, OptionsModel::Language); mapper->addMapping(ui->lang, OptionsModel::Language);
mapper->addMapping(ui->unit, OptionsModel::DisplayUnit); mapper->addMapping(ui->unit, OptionsModel::DisplayUnit);
mapper->addMapping(ui->displayAddresses, OptionsModel::DisplayAddresses); mapper->addMapping(ui->displayAddresses, OptionsModel::DisplayAddresses);
mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures);
} }
void OptionsDialog::enableOkButton() void OptionsDialog::enableOkButton()