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,83 +346,77 @@
<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> <layout class="QHBoxLayout" name="horizontalLayoutPanel" stretch="0,0,0,0,0">
<x>10</x> <property name="spacing">
<y>0</y> <number>14</number>
<width>781</width> </property>
<height>41</height> <item>
</rect> <widget class="QPushButton" name="pushButtonSelectAll">
</property> <property name="sizePolicy">
<layout class="QHBoxLayout" name="horizontalLayoutPanel" stretch="0,0,0,0,0"> <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<property name="spacing"> <horstretch>0</horstretch>
<number>14</number> <verstretch>0</verstretch>
</property> </sizepolicy>
<item> </property>
<widget class="QPushButton" name="pushButtonSelectAll"> <property name="text">
<property name="sizePolicy"> <string>(un)select all</string>
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> </property>
<horstretch>0</horstretch> </widget>
<verstretch>0</verstretch> </item>
</sizepolicy> <item>
</property> <widget class="QRadioButton" name="radioTreeMode">
<property name="text"> <property name="sizePolicy">
<string>(un)select all</string> <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
</property> <horstretch>0</horstretch>
</widget> <verstretch>0</verstretch>
</item> </sizepolicy>
<item> </property>
<widget class="QRadioButton" name="radioTreeMode"> <property name="text">
<property name="sizePolicy"> <string>Tree mode</string>
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> </property>
<horstretch>0</horstretch> <property name="checked">
<verstretch>0</verstretch> <bool>true</bool>
</sizepolicy> </property>
</property> </widget>
<property name="text"> </item>
<string>Tree mode</string> <item>
</property> <widget class="QRadioButton" name="radioListMode">
<property name="checked"> <property name="sizePolicy">
<bool>true</bool> <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
</property> <horstretch>0</horstretch>
</widget> <verstretch>0</verstretch>
</item> </sizepolicy>
<item> </property>
<widget class="QRadioButton" name="radioListMode"> <property name="text">
<property name="sizePolicy"> <string>List mode</string>
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> </property>
<horstretch>0</horstretch> </widget>
<verstretch>0</verstretch> </item>
</sizepolicy> <item>
</property> <widget class="QLabel" name="labelLocked">
<property name="text"> <property name="text">
<string>List mode</string> <string notr="true">(1 locked)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="labelLocked"> <spacer name="horizontalSpacer">
<property name="text"> <property name="orientation">
<string notr="true">(1 locked)</string> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
</item> <size>
<item> <width>40</width>
<spacer name="horizontalSpacer"> <height>20</height>
<property name="orientation"> </size>
<enum>Qt::Horizontal</enum> </property>
</property> </spacer>
<property name="sizeHint" stdset="0"> </item>
<size> </layout>
<width>40</width> </item>
<height>20</height> </layout>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
<item> <item>

View File

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