diff options
Diffstat (limited to 'src/qt/forms/optionsdialog.ui')
| -rw-r--r-- | src/qt/forms/optionsdialog.ui | 285 |
1 files changed, 223 insertions, 62 deletions
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 28b629b38c..a555f13c2a 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>540</width> - <height>380</height> + <width>560</width> + <height>400</height> </rect> </property> <property name="windowTitle"> @@ -19,9 +19,6 @@ <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QTabWidget" name="tabWidget"> - <property name="tabPosition"> - <enum>QTabWidget::North</enum> - </property> <property name="currentIndex"> <number>0</number> </property> @@ -31,38 +28,45 @@ </attribute> <layout class="QVBoxLayout" name="verticalLayout_Main"> <item> - <widget class="QLabel" name="transactionFeeInfoLabel"> - <property name="text"> - <string>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</string> - </property> - <property name="textFormat"> - <enum>Qt::PlainText</enum> + <widget class="QCheckBox" name="bitcoinAtStartup"> + <property name="toolTip"> + <string>Automatically start Bitcoin after logging in to the system.</string> </property> - <property name="wordWrap"> - <bool>true</bool> + <property name="text"> + <string>&Start Bitcoin on system login</string> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_1_Main"> + <layout class="QHBoxLayout" name="horizontalLayout_2_Main"> <item> - <widget class="QLabel" name="transactionFeeLabel"> + <widget class="QLabel" name="databaseCacheLabel"> <property name="text"> - <string>Pay transaction &fee</string> + <string>Size of &database cache</string> </property> <property name="textFormat"> <enum>Qt::PlainText</enum> </property> <property name="buddy"> - <cstring>transactionFee</cstring> + <cstring>databaseCache</cstring> </property> </widget> </item> <item> - <widget class="BitcoinAmountField" name="transactionFee"/> + <widget class="QSpinBox" name="databaseCache"/> </item> <item> - <spacer name="horizontalSpacer_1_Main"> + <widget class="QLabel" name="databaseCacheUnitLabel"> + <property name="text"> + <string>MB</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2_Main"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -77,14 +81,47 @@ </layout> </item> <item> - <widget class="QCheckBox" name="bitcoinAtStartup"> - <property name="toolTip"> - <string>Automatically start Bitcoin after logging in to the system.</string> - </property> - <property name="text"> - <string>&Start Bitcoin on system login</string> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout_3_Main"> + <item> + <widget class="QLabel" name="threadsScriptVerifLabel"> + <property name="text"> + <string>Number of script &verification threads</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="buddy"> + <cstring>threadsScriptVerif</cstring> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="threadsScriptVerif"> + <property name="toolTip"> + <string>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</string> + </property> + <property name="minimum"> + <number>-16</number> + </property> + <property name="maximum"> + <number>16</number> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_3_Main"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> </item> <item> <spacer name="verticalSpacer_Main"> @@ -99,10 +136,46 @@ </property> </spacer> </item> + </layout> + </widget> + <widget class="QWidget" name="tabWallet"> + <attribute name="title"> + <string>W&allet</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_Wallet"> + <item> + <widget class="QLabel" name="transactionFeeInfoLabel"> + <property name="text"> + <string>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2_Main"> + <layout class="QHBoxLayout" name="horizontalLayout_1_Wallet"> <item> - <spacer name="horizontalSpacer_2_Main"> + <widget class="QLabel" name="transactionFeeLabel"> + <property name="text"> + <string>Pay transaction &fee</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="buddy"> + <cstring>transactionFee</cstring> + </property> + </widget> + </item> + <item> + <widget class="BitcoinAmountField" name="transactionFee"/> + </item> + <item> + <spacer name="horizontalSpacer_1_Wallet"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -114,21 +187,41 @@ </property> </spacer> </item> - <item> - <widget class="QPushButton" name="resetButton"> - <property name="toolTip"> - <string>Reset all client options to default.</string> - </property> - <property name="text"> - <string>&Reset Options</string> - </property> - <property name="autoDefault"> - <bool>false</bool> - </property> - </widget> - </item> </layout> </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>&Spend unconfirmed change (experts only)</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_Wallet"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> </widget> <widget class="QWidget" name="tabNetwork"> @@ -149,15 +242,15 @@ <item> <widget class="QCheckBox" name="connectSocks"> <property name="toolTip"> - <string>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</string> + <string>Connect to the Bitcoin network through a SOCKS proxy.</string> </property> <property name="text"> - <string>&Connect through SOCKS proxy:</string> + <string>&Connect through SOCKS proxy (default proxy):</string> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_Network"> + <layout class="QHBoxLayout" name="horizontalLayout_1_Network"> <item> <widget class="QLabel" name="proxyIpLabel"> <property name="text"> @@ -173,6 +266,12 @@ </item> <item> <widget class="QValidatedLineEdit" name="proxyIp"> + <property name="minimumSize"> + <size> + <width>140</width> + <height>0</height> + </size> + </property> <property name="maximumSize"> <size> <width>140</width> @@ -180,7 +279,7 @@ </size> </property> <property name="toolTip"> - <string>IP address of the proxy (e.g. 127.0.0.1)</string> + <string>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</string> </property> </widget> </item> @@ -199,6 +298,12 @@ </item> <item> <widget class="QLineEdit" name="proxyPort"> + <property name="minimumSize"> + <size> + <width>55</width> + <height>0</height> + </size> + </property> <property name="maximumSize"> <size> <width>55</width> @@ -231,7 +336,7 @@ </widget> </item> <item> - <spacer name="horizontalSpacer_Network"> + <spacer name="horizontalSpacer_1_Network"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -391,8 +496,67 @@ </widget> </item> <item> + <widget class="QFrame" name="frame"> + <layout class="QVBoxLayout" name="verticalLayout_Bottom"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_Bottom"> + <item> + <widget class="QLabel" name="overriddenByCommandLineInfoLabel"> + <property name="text"> + <string>Active command-line options that override above options:</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_Bottom"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="overriddenByCommandLineLabel"> + <property name="text"> + <string/> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <layout class="QHBoxLayout" name="horizontalLayout_Buttons"> <item> + <widget class="QPushButton" name="resetButton"> + <property name="toolTip"> + <string>Reset all client options to default.</string> + </property> + <property name="text"> + <string>&Reset Options</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer_1"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -407,6 +571,12 @@ </item> <item> <widget class="QLabel" name="statusLabel"> + <property name="minimumSize"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> <property name="font"> <font> <weight>75</weight> @@ -454,16 +624,6 @@ </property> </widget> </item> - <item> - <widget class="QPushButton" name="applyButton"> - <property name="text"> - <string>&Apply</string> - </property> - <property name="autoDefault"> - <bool>false</bool> - </property> - </widget> - </item> </layout> </item> </layout> @@ -473,17 +633,18 @@ <class>BitcoinAmountField</class> <extends>QLineEdit</extends> <header>bitcoinamountfield.h</header> - </customwidget> - <customwidget> - <class>QValueComboBox</class> - <extends>QComboBox</extends> - <header>qvaluecombobox.h</header> + <container>1</container> </customwidget> <customwidget> <class>QValidatedLineEdit</class> <extends>QLineEdit</extends> <header>qvalidatedlineedit.h</header> </customwidget> + <customwidget> + <class>QValueComboBox</class> + <extends>QComboBox</extends> + <header>qvaluecombobox.h</header> + </customwidget> </customwidgets> <resources/> <connections/> |