aboutsummaryrefslogtreecommitdiff
path: root/src/qt/forms
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-12-03 09:10:10 +0100
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2014-01-06 16:19:04 +0100
commit7e195e8459ad741368db6bb574981fccb1707268 (patch)
treed14b125aac61867a028af5dab191926789848182 /src/qt/forms
parent65515c0d05678334a52f686eaaa2bac1ff285a5a (diff)
[Qt] massive options/settings rework (no core changes)
- add new options for database cache and script verification threads - add label which displays options that are overridden by command-line parameters - proxy settings are not applied on-the-fly anymore and require a client restart (ApplyProxySettings() was removed and was not working very well anyway) - re-work options reset and require a client shutdown (as it is much easier to do it this way without having to mess with what can be changed on-the-fly and what needs a restart anyway) - options reset now writes default values for every single option - when changing an option which requires a client restart display a 10 second warning message in statusLabel (via a QTimer) - when applying the changes via ok change that to a persistent message, which is displayed even after closing optionsdialog and re-open it, when no client restart was made - remove dialog boxes used when changing language or proxy settings - add setRestartRequired() and isRestartRequired() to OptionsModel and use the set function when updating options to signal OptionsDialog when a restart is needed - resize optionsdialog a little and add some min sizes for certain GUI elements - remove apply button from optionsdialog - save and restore optionsdialog window position - update nTransactionFee in QSettings with a set -paytxfee value when opening optionsdialog (I'm not sure about this yet, perhaps revert to not updating QSettings and just display current -paytxfee value in optionsdialog.)
Diffstat (limited to 'src/qt/forms')
-rw-r--r--src/qt/forms/optionsdialog.ui219
1 files changed, 175 insertions, 44 deletions
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index 28b629b38c..9056ab7696 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>
@@ -87,21 +84,44 @@
</widget>
</item>
<item>
- <spacer name="verticalSpacer_Main">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
<layout class="QHBoxLayout" name="horizontalLayout_2_Main">
<item>
+ <widget class="QLabel" name="databaseCacheLabel">
+ <property name="text">
+ <string>Size of &amp;database cache</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::PlainText</enum>
+ </property>
+ <property name="buddy">
+ <cstring>databaseCache</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="databaseCache">
+ <property name="toolTip">
+ <string>Set database cache size in megabytes (default: 25)</string>
+ </property>
+ <property name="maximum">
+ <number>1024</number>
+ </property>
+ <property name="value">
+ <number>25</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <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>
@@ -114,21 +134,64 @@
</property>
</spacer>
</item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3_Main">
+ <item>
+ <widget class="QLabel" name="threadsScriptVerifLabel">
+ <property name="text">
+ <string>Number of script &amp;verification threads</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::PlainText</enum>
+ </property>
+ <property name="buddy">
+ <cstring>threadsScriptVerif</cstring>
+ </property>
+ </widget>
+ </item>
<item>
- <widget class="QPushButton" name="resetButton">
+ <widget class="QSpinBox" name="threadsScriptVerif">
<property name="toolTip">
- <string>Reset all client options to default.</string>
+ <string>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</string>
</property>
- <property name="text">
- <string>&amp;Reset Options</string>
+ <property name="minimum">
+ <number>-16</number>
</property>
- <property name="autoDefault">
- <bool>false</bool>
+ <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">
+ <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 +212,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>&amp;Connect through SOCKS proxy:</string>
+ <string>&amp;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 +236,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 +249,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 +268,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 +306,7 @@
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_Network">
+ <spacer name="horizontalSpacer_1_Network">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -391,8 +466,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>&amp;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 +541,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 +594,6 @@
</property>
</widget>
</item>
- <item>
- <widget class="QPushButton" name="applyButton">
- <property name="text">
- <string>&amp;Apply</string>
- </property>
- <property name="autoDefault">
- <bool>false</bool>
- </property>
- </widget>
- </item>
</layout>
</item>
</layout>
@@ -473,17 +603,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/>