Merge pull request #3693

f05fa03 [Qt] small .ui cleanup for optionsdialog and coincontrol (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-02-18 14:37:50 +01:00
commit 5c99323459
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 80 additions and 83 deletions

View File

@ -346,15 +346,8 @@
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>0</y>
<width>781</width>
<height>41</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayoutPanel" stretch="0,0,0,0,0">
<property name="spacing">
<number>14</number>
@ -422,7 +415,8 @@
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>

View File

@ -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>