aboutsummaryrefslogtreecommitdiff
path: root/src/qt/forms/optionsdialog.ui
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-02-18 14:37:50 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2014-02-18 14:37:58 +0100
commit5c9932345976de17b1a02401162466995d8355e3 (patch)
tree4411f45a62774e96d88db04282068465de623f0e /src/qt/forms/optionsdialog.ui
parentbd8e3751d7cec48428283d29682db7b80474f2ca (diff)
parentf05fa03e8bfe806eae60c1de4a7780efa5aa8e04 (diff)
downloadbitcoin-5c9932345976de17b1a02401162466995d8355e3.tar.xz
Merge pull request #3693
f05fa03 [Qt] small .ui cleanup for optionsdialog and coincontrol (Philip Kaufmann)
Diffstat (limited to 'src/qt/forms/optionsdialog.ui')
-rw-r--r--src/qt/forms/optionsdialog.ui15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index a0626f989c..a555f13c2a 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -142,7 +142,7 @@
<attribute name="title">
<string>W&amp;allet</string>
</attribute>
- <layout class="QVBoxLayout" name="verticalLayout_Network">
+ <layout class="QVBoxLayout" name="verticalLayout_Wallet">
<item>
<widget class="QLabel" name="transactionFeeInfoLabel">
<property name="text">
@@ -157,7 +157,7 @@
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_1_Main">
+ <layout class="QHBoxLayout" name="horizontalLayout_1_Wallet">
<item>
<widget class="QLabel" name="transactionFeeLabel">
<property name="text">
@@ -175,7 +175,7 @@
<widget class="BitcoinAmountField" name="transactionFee"/>
</item>
<item>
- <spacer name="horizontalSpacer_1_Main">
+ <spacer name="horizontalSpacer_1_Wallet">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -190,10 +190,13 @@
</layout>
</item>
<item>
- <widget class="QLabel" name="label">
+ <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>
@@ -202,12 +205,12 @@
<item>
<widget class="QCheckBox" name="spendZeroConfChange">
<property name="text">
- <string>Spend unconfirmed change (experts only)</string>
+ <string>&amp;Spend unconfirmed change (experts only)</string>
</property>
</widget>
</item>
<item>
- <spacer name="verticalSpacer">
+ <spacer name="verticalSpacer_Wallet">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>