No OneTemporary
Actions

Size

25 KB

Subscribers

None

View Options

	diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
	index 270b7ae9ef..1b81b0cdc8 100644
	--- a/src/qt/forms/optionsdialog.ui
	+++ b/src/qt/forms/optionsdialog.ui
	@@ -1,466 +1,460 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<ui version="4.0">
	<class>OptionsDialog</class>
	<widget class="QDialog" name="OptionsDialog">
	<property name="geometry">
	<rect>
	<x>0</x>
	<y>0</y>
	<width>540</width>
	<height>380</height>
	</rect>
	</property>
	<property name="windowTitle">
	<string>Options</string>
	</property>
	<property name="modal">
	<bool>true</bool>
	</property>
	<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>
	<widget class="QWidget" name="tabMain">
	<attribute name="title">
	<string>&Main</string>
	</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. Fee 0.01 recommended.</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_Main">
	<item>
	<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_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>
	<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>
	</item>
	<item>
	<widget class="QCheckBox" name="detachDatabases">
	<property name="toolTip">
	<string>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</string>
	</property>
	<property name="text">
	<string>&Detach databases at shutdown</string>
	</property>
	</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>
	</layout>
	</widget>
	<widget class="QWidget" name="tabNetwork">
	<attribute name="title">
	<string>&Network</string>
	</attribute>
	<layout class="QVBoxLayout" name="verticalLayout_Network">
	<item>
	<widget class="QCheckBox" name="mapPortUpnp">
	<property name="toolTip">
	<string>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</string>
	</property>
	<property name="text">
	<string>Map port using &UPnP</string>
	</property>
	</widget>
	</item>
	<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>
	</property>
	<property name="text">
	<string>&Connect through SOCKS proxy:</string>
	</property>
	</widget>
	</item>
	<item>
	<layout class="QHBoxLayout" name="horizontalLayout_Network">
	<item>
	<widget class="QLabel" name="proxyIpLabel">
	<property name="text">
	<string>Proxy &IP:</string>
	</property>
	<property name="textFormat">
	<enum>Qt::PlainText</enum>
	</property>
	<property name="buddy">
	<cstring>proxyIp</cstring>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QValidatedLineEdit" name="proxyIp">
	<property name="maximumSize">
	<size>
	<width>140</width>
	<height>16777215</height>
	</size>
	</property>
	<property name="toolTip">
	<string>IP address of the proxy (e.g. 127.0.0.1)</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QLabel" name="proxyPortLabel">
	<property name="text">
	<string>&Port:</string>
	</property>
	<property name="textFormat">
	<enum>Qt::PlainText</enum>
	</property>
	<property name="buddy">
	<cstring>proxyPort</cstring>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QLineEdit" name="proxyPort">
	<property name="maximumSize">
	<size>
	<width>55</width>
	<height>16777215</height>
	</size>
	</property>
	<property name="toolTip">
	<string>Port of the proxy (e.g. 9050)</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QLabel" name="socksVersionLabel">
	<property name="text">
	<string>SOCKS &Version:</string>
	</property>
	<property name="textFormat">
	<enum>Qt::PlainText</enum>
	</property>
	<property name="buddy">
	<cstring>socksVersion</cstring>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QValueComboBox" name="socksVersion">
	<property name="toolTip">
	<string>SOCKS version of the proxy (e.g. 5)</string>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="horizontalSpacer_Network">
	<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_Network">
	<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="tabWindow">
	<attribute name="title">
	<string>&Window</string>
	</attribute>
	<layout class="QVBoxLayout" name="verticalLayout_Window">
	<item>
	<widget class="QCheckBox" name="minimizeToTray">
	<property name="toolTip">
	<string>Show only a tray icon after minimizing the window.</string>
	</property>
	<property name="text">
	<string>&Minimize to the tray instead of the taskbar</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QCheckBox" name="minimizeOnClose">
	<property name="toolTip">
	<string>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</string>
	</property>
	<property name="text">
	<string>M&inimize on close</string>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="verticalSpacer_Window">
	<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="tabDisplay">
	<attribute name="title">
	<string>&Display</string>
	</attribute>
	<layout class="QVBoxLayout" name="verticalLayout_Display">
	<item>
	<layout class="QHBoxLayout" name="horizontalLayout_1_Display">
	<item>
	<widget class="QLabel" name="langLabel">
	<property name="text">
	<string>User Interface &language:</string>
	</property>
	<property name="textFormat">
	<enum>Qt::PlainText</enum>
	</property>
	<property name="buddy">
	<cstring>lang</cstring>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QValueComboBox" name="lang">
	<property name="toolTip">
	<string>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</string>
	</property>
	</widget>
	</item>
	</layout>
	</item>
	<item>
	<layout class="QHBoxLayout" name="horizontalLayout_2_Display">
	<item>
	<widget class="QLabel" name="unitLabel">
	<property name="text">
	<string>&Unit to show amounts in:</string>
	</property>
	<property name="textFormat">
	<enum>Qt::PlainText</enum>
	</property>
	<property name="buddy">
	<cstring>unit</cstring>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QValueComboBox" name="unit">
	<property name="toolTip">
	<string>Choose the default subdivision unit to show in the interface and when sending coins.</string>
	</property>
	</widget>
	</item>
	</layout>
	</item>
	<item>
	<widget class="QCheckBox" name="displayAddresses">
	<property name="toolTip">
	<string>Whether to show Bitcoin addresses in the transaction list or not.</string>
	</property>
	<property name="text">
	<string>&Display addresses in transaction list</string>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="verticalSpacer_Display">
	<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>
	</item>
	<item>
	<layout class="QHBoxLayout" name="horizontalLayout_Buttons">
	<item>
	<spacer name="horizontalSpacer_1">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>40</width>
	<height>48</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<widget class="QLabel" name="statusLabel">
	<property name="font">
	<font>
	<weight>75</weight>
	<bold>true</bold>
	</font>
	</property>
	<property name="text">
	<string/>
	</property>
	<property name="textFormat">
	<enum>Qt::PlainText</enum>
	</property>
	<property name="wordWrap">
	<bool>true</bool>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="horizontalSpacer_2">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>40</width>
	<height>48</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<widget class="QPushButton" name="okButton">
	<property name="text">
	<string>&OK</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QPushButton" name="cancelButton">
	<property name="text">
	<string>&Cancel</string>
	</property>
	<property name="autoDefault">
	<bool>false</bool>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QPushButton" name="applyButton">
	<property name="text">
	<string>&Apply</string>
	</property>
	<property name="autoDefault">
	<bool>false</bool>
	</property>
	- <property name="default">
	- <bool>false</bool>
	- </property>
	- <property name="flat">
	- <bool>false</bool>
	- </property>
	</widget>
	</item>
	</layout>
	</item>
	</layout>
	</widget>
	<customwidgets>
	<customwidget>
	<class>BitcoinAmountField</class>
	<extends>QSpinBox</extends>
	<header>bitcoinamountfield.h</header>
	</customwidget>
	<customwidget>
	<class>QValueComboBox</class>
	<extends>QComboBox</extends>
	<header>qvaluecombobox.h</header>
	</customwidget>
	<customwidget>
	<class>QValidatedLineEdit</class>
	<extends>QLineEdit</extends>
	<header>qvalidatedlineedit.h</header>
	</customwidget>
	</customwidgets>
	<resources/>
	<connections/>
	</ui>
	diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
	index 6bb7eaec2e..f8d1fe56fb 100644
	--- a/src/qt/optionsdialog.cpp
	+++ b/src/qt/optionsdialog.cpp
	@@ -1,243 +1,256 @@
	#include "optionsdialog.h"
	#include "ui_optionsdialog.h"

	#include "bitcoinunits.h"
	#include "monitoreddatamapper.h"
	#include "netbase.h"
	#include "optionsmodel.h"

	#include <QDir>
	#include <QIntValidator>
	#include <QLocale>
	#include <QMessageBox>
	#include <QRegExp>
	#include <QRegExpValidator>

	OptionsDialog::OptionsDialog(QWidget *parent) :
	QDialog(parent),
	ui(new Ui::OptionsDialog),
	model(0),
	mapper(0),
	fRestartWarningDisplayed_Proxy(false),
	fRestartWarningDisplayed_Lang(false),
	fProxyIpValid(true)
	{
	ui->setupUi(this);

	/* Network elements init */
	#ifndef USE_UPNP
	ui->mapPortUpnp->setEnabled(false);
	#endif

	ui->proxyIp->setEnabled(false);
	ui->proxyPort->setEnabled(false);
	ui->proxyPort->setValidator(new QIntValidator(1, 65535, this));

	ui->socksVersion->setEnabled(false);
	ui->socksVersion->addItem("5", 5);
	ui->socksVersion->addItem("4", 4);
	ui->socksVersion->setCurrentIndex(0);

	connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->proxyIp, SLOT(setEnabled(bool)));
	connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->proxyPort, SLOT(setEnabled(bool)));
	connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->socksVersion, SLOT(setEnabled(bool)));
	connect(ui->connectSocks, SIGNAL(clicked(bool)), this, SLOT(showRestartWarning_Proxy()));

	ui->proxyIp->installEventFilter(this);

	/* Window elements init */
	#ifdef Q_WS_MAC
	ui->tabWindow->setVisible(false);
	#endif

	/* Display elements init */
	QDir translations(":translations");
	ui->lang->addItem(QString("(") + tr("default") + QString(")"), QVariant(""));
	foreach(const QString &langStr, translations.entryList())
	{
	QLocale locale(langStr);

	/** check if the locale name consists of 2 parts (language_country) */
	if(langStr.contains("_"))
	{
	#if QT_VERSION >= 0x040800
	/** display language strings as "native language - native country (locale name)", e.g. "Deutsch - Deutschland (de)" */
	ui->lang->addItem(locale.nativeLanguageName() + QString(" - ") + locale.nativeCountryName() + QString(" (") + langStr + QString(")"), QVariant(langStr));
	#else
	/** display language strings as "language - country (locale name)", e.g. "German - Germany (de)" */
	ui->lang->addItem(QLocale::languageToString(locale.language()) + QString(" - ") + QLocale::countryToString(locale.country()) + QString(" (") + langStr + QString(")"), QVariant(langStr));
	#endif
	}
	else
	{
	#if QT_VERSION >= 0x040800
	/** display language strings as "native language (locale name)", e.g. "Deutsch (de)" */
	ui->lang->addItem(locale.nativeLanguageName() + QString(" (") + langStr + QString(")"), QVariant(langStr));
	#else
	/** display language strings as "language (locale name)", e.g. "German (de)" */
	ui->lang->addItem(QLocale::languageToString(locale.language()) + QString(" (") + langStr + QString(")"), QVariant(langStr));
	#endif
	}
	}

	ui->unit->setModel(new BitcoinUnits(this));

	/* Widget-to-option mapper */
	mapper = new MonitoredDataMapper(this);
	mapper->setSubmitPolicy(QDataWidgetMapper::ManualSubmit);
	mapper->setOrientation(Qt::Vertical);

	- /* enable save buttons when data modified */
	- connect(mapper, SIGNAL(viewModified()), this, SLOT(enableSaveButtons()));
	- /* disable save buttons when new data loaded */
	- connect(mapper, SIGNAL(currentIndexChanged(int)), this, SLOT(disableSaveButtons()));
	+ /* enable apply button when data modified */
	+ connect(mapper, SIGNAL(viewModified()), this, SLOT(enableApplyButton()));
	+ /* disable apply button when new data loaded */
	+ connect(mapper, SIGNAL(currentIndexChanged(int)), this, SLOT(disableApplyButton()));
	/* setup/change UI elements when proxy IP is invalid/valid */
	connect(this, SIGNAL(proxyIpValid(QValidatedLineEdit , bool)), this, SLOT(handleProxyIpValid(QValidatedLineEdit , bool)));
	}

	OptionsDialog::~OptionsDialog()
	{
	delete ui;
	}

	void OptionsDialog::setModel(OptionsModel *model)
	{
	this->model = model;

	if(model)
	{
	connect(model, SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));

	mapper->setModel(model);
	setMapper();
	mapper->toFirst();
	}

	/* update the display unit, to not use the default ("BTC") */
	updateDisplayUnit();

	- /* warn only when language selection changes (placed here so init of ui->lang via mapper doesn't trigger this) */
	+ /* warn only when language selection changes by user action (placed here so init via mapper doesn't trigger this) */
	connect(ui->lang, SIGNAL(valueChanged()), this, SLOT(showRestartWarning_Lang()));
	+
	+ /* disable apply button after settings are loaded as there is nothing to save */
	+ disableApplyButton();
	}

	void OptionsDialog::setMapper()
	{
	/* Main */
	mapper->addMapping(ui->transactionFee, OptionsModel::Fee);
	mapper->addMapping(ui->bitcoinAtStartup, OptionsModel::StartAtStartup);
	mapper->addMapping(ui->detachDatabases, OptionsModel::DetachDatabases);

	/* Network */
	mapper->addMapping(ui->mapPortUpnp, OptionsModel::MapPortUPnP);

	mapper->addMapping(ui->connectSocks, OptionsModel::ProxyUse);
	mapper->addMapping(ui->proxyIp, OptionsModel::ProxyIP);
	mapper->addMapping(ui->proxyPort, OptionsModel::ProxyPort);
	mapper->addMapping(ui->socksVersion, OptionsModel::ProxySocksVersion);

	/* Window */
	#ifndef Q_WS_MAC
	mapper->addMapping(ui->minimizeToTray, OptionsModel::MinimizeToTray);
	mapper->addMapping(ui->minimizeOnClose, OptionsModel::MinimizeOnClose);
	#endif

	/* Display */
	mapper->addMapping(ui->lang, OptionsModel::Language);
	mapper->addMapping(ui->unit, OptionsModel::DisplayUnit);
	mapper->addMapping(ui->displayAddresses, OptionsModel::DisplayAddresses);
	}

	+void OptionsDialog::enableApplyButton()
	+{
	+ ui->applyButton->setEnabled(true);
	+}
	+
	+void OptionsDialog::disableApplyButton()
	+{
	+ ui->applyButton->setEnabled(false);
	+}
	+
	void OptionsDialog::enableSaveButtons()
	{
	/* prevent enabling of the save buttons when data modified, if there is an invalid proxy address present */
	if(fProxyIpValid)
	setSaveButtonState(true);
	}

	void OptionsDialog::disableSaveButtons()
	{
	setSaveButtonState(false);
	}

	void OptionsDialog::setSaveButtonState(bool fState)
	{
	ui->applyButton->setEnabled(fState);
	ui->okButton->setEnabled(fState);
	}

	void OptionsDialog::on_okButton_clicked()
	{
	mapper->submit();
	accept();
	}

	void OptionsDialog::on_cancelButton_clicked()
	{
	reject();
	}

	void OptionsDialog::on_applyButton_clicked()
	{
	mapper->submit();
	- ui->applyButton->setEnabled(false);
	+ disableApplyButton();
	}

	void OptionsDialog::showRestartWarning_Proxy()
	{
	if(!fRestartWarningDisplayed_Proxy)
	{
	QMessageBox::warning(this, tr("Warning"), tr("This setting will take effect after restarting Bitcoin."), QMessageBox::Ok);
	fRestartWarningDisplayed_Proxy = true;
	}
	}

	void OptionsDialog::showRestartWarning_Lang()
	{
	if(!fRestartWarningDisplayed_Lang)
	{
	QMessageBox::warning(this, tr("Warning"), tr("This setting will take effect after restarting Bitcoin."), QMessageBox::Ok);
	fRestartWarningDisplayed_Lang = true;
	}
	}

	void OptionsDialog::updateDisplayUnit()
	{
	if(model)
	{
	/* Update transactionFee with the current unit */
	ui->transactionFee->setDisplayUnit(model->getDisplayUnit());
	}
	}

	void OptionsDialog::handleProxyIpValid(QValidatedLineEdit *object, bool fState)
	{
	// this is used in a check before re-enabling the save buttons
	fProxyIpValid = fState;

	if(fProxyIpValid)
	{
	enableSaveButtons();
	ui->statusLabel->clear();
	}
	else
	{
	disableSaveButtons();
	object->setValid(fProxyIpValid);
	ui->statusLabel->setStyleSheet("QLabel { color: red; }");
	ui->statusLabel->setText(tr("The supplied proxy address is invalid."));
	}
	}

	bool OptionsDialog::eventFilter(QObject object, QEvent event)
	{
	if(event->type() == QEvent::FocusOut)
	{
	if(object == ui->proxyIp)
	{
	CService addr;
	/* Check proxyIp for a valid IPv4/IPv6 address and emit the proxyIpValid signal */
	emit proxyIpValid(ui->proxyIp, LookupNumeric(ui->proxyIp->text().toStdString().c_str(), addr));
	}
	}
	return QDialog::eventFilter(object, event);
	}
	diff --git a/src/qt/optionsdialog.h b/src/qt/optionsdialog.h
	index 9e91000b63..18469f509d 100644
	--- a/src/qt/optionsdialog.h
	+++ b/src/qt/optionsdialog.h
	@@ -1,56 +1,60 @@
	#ifndef OPTIONSDIALOG_H
	#define OPTIONSDIALOG_H

	#include <QDialog>

	namespace Ui {
	class OptionsDialog;
	}
	class OptionsModel;
	class MonitoredDataMapper;
	class QValidatedLineEdit;

	/** Preferences dialog. */
	class OptionsDialog : public QDialog
	{
	Q_OBJECT

	public:
	explicit OptionsDialog(QWidget *parent = 0);
	~OptionsDialog();

	void setModel(OptionsModel *model);
	void setMapper();

	protected:
	bool eventFilter(QObject object, QEvent event);

	private slots:
	+ /* enable only apply button */
	+ void enableApplyButton();
	+ /* disable only apply button */
	+ void disableApplyButton();
	/* enable apply button and OK button */
	void enableSaveButtons();
	/* disable apply button and OK button */
	void disableSaveButtons();
	/* set apply button and OK button state (enabled / disabled) */
	void setSaveButtonState(bool fState);
	void on_okButton_clicked();
	void on_cancelButton_clicked();
	void on_applyButton_clicked();

	void showRestartWarning_Proxy();
	void showRestartWarning_Lang();
	void updateDisplayUnit();
	void handleProxyIpValid(QValidatedLineEdit *object, bool fState);

	signals:
	void proxyIpValid(QValidatedLineEdit *object, bool fValid);

	private:
	Ui::OptionsDialog *ui;
	OptionsModel *model;
	MonitoredDataMapper *mapper;
	bool fRestartWarningDisplayed_Proxy;
	bool fRestartWarningDisplayed_Lang;
	bool fProxyIpValid;
	};

	#endif // OPTIONSDIALOG_H

File Metadata

Mime Type: text/x-diff
Expires: Sun, Mar 2, 09:55 (1 d, 4 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5187270
Default Alt Text: (25 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions