Browse Source

Merge pull request #3693

f05fa03 [Qt] small .ui cleanup for optionsdialog and coincontrol (Philip Kaufmann)
0.10
Wladimir J. van der Laan 11 years ago
parent
commit
5c99323459
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 14
      src/qt/forms/coincontroldialog.ui
  2. 15
      src/qt/forms/optionsdialog.ui

14
src/qt/forms/coincontroldialog.ui

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

15
src/qt/forms/optionsdialog.ui

@ -142,7 +142,7 @@
<attribute name="title"> <attribute name="title">
<string>W&amp;allet</string> <string>W&amp;allet</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_Network"> <layout class="QVBoxLayout" name="verticalLayout_Wallet">
<item> <item>
<widget class="QLabel" name="transactionFeeInfoLabel"> <widget class="QLabel" name="transactionFeeInfoLabel">
<property name="text"> <property name="text">
@ -157,7 +157,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_1_Main"> <layout class="QHBoxLayout" name="horizontalLayout_1_Wallet">
<item> <item>
<widget class="QLabel" name="transactionFeeLabel"> <widget class="QLabel" name="transactionFeeLabel">
<property name="text"> <property name="text">
@ -175,7 +175,7 @@
<widget class="BitcoinAmountField" name="transactionFee"/> <widget class="BitcoinAmountField" name="transactionFee"/>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_1_Main"> <spacer name="horizontalSpacer_1_Wallet">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -190,10 +190,13 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="spendZeroConfChangeInfoLabel">
<property name="text"> <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> <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>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -202,12 +205,12 @@
<item> <item>
<widget class="QCheckBox" name="spendZeroConfChange"> <widget class="QCheckBox" name="spendZeroConfChange">
<property name="text"> <property name="text">
<string>Spend unconfirmed change (experts only)</string> <string>&amp;Spend unconfirmed change (experts only)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer_Wallet">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>

Loading…
Cancel
Save