diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index 846f3087..29101de5 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -26,7 +26,7 @@
QTabWidget::North
- 3
+ 1
@@ -165,85 +165,6 @@
- -
-
-
- Connect to the DigitalNote network through a SOCKS5 proxy (e.g. when connecting through Tor).
-
-
- &Connect through SOCKS5 proxy:
-
-
-
- -
-
-
-
-
-
- Proxy &IP:
-
-
- Qt::PlainText
-
-
- proxyIp
-
-
-
- -
-
-
-
- 140
- 16777215
-
-
-
- IP address of the proxy (e.g. 127.0.0.1)
-
-
-
- -
-
-
- &Port:
-
-
- Qt::PlainText
-
-
- proxyPort
-
-
-
- -
-
-
-
- 55
- 16777215
-
-
-
- Port of the proxy (e.g. 9050)
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
@@ -465,11 +386,6 @@
-
- QValidatedLineEdit
- QLineEdit
-
-
DigitalNoteAmountField
QSpinBox
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 0d2999bd..433d3e8e 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -16,9 +16,7 @@ OptionsDialog::OptionsDialog(QWidget *parent) :
ui(new Ui::OptionsDialog),
model(0),
mapper(0),
- fRestartWarningDisplayed_Proxy(false),
- fRestartWarningDisplayed_Lang(false),
- fProxyIpValid(true)
+ fRestartWarningDisplayed_Lang(false)
{
ui->setupUi(this);
@@ -27,16 +25,6 @@ OptionsDialog::OptionsDialog(QWidget *parent) :
ui->mapPortUpnp->setEnabled(false);
#endif
- ui->proxyIp->setEnabled(false);
- ui->proxyPort->setEnabled(false);
- ui->proxyPort->setValidator(new QIntValidator(1, 65535, this));
-
- 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(clicked(bool)), this, SLOT(showRestartWarning_Proxy()));
-
- ui->proxyIp->installEventFilter(this);
-
/* Window elements init */
#ifdef Q_OS_MAC
ui->tabWindow->setVisible(false);
@@ -83,8 +71,6 @@ OptionsDialog::OptionsDialog(QWidget *parent) :
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()
@@ -125,10 +111,6 @@ void OptionsDialog::setMapper()
/* 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);
-
/* Window */
#ifndef Q_OS_MAC
mapper->addMapping(ui->minimizeToTray, OptionsModel::MinimizeToTray);
@@ -154,8 +136,7 @@ void OptionsDialog::disableApplyButton()
void OptionsDialog::enableSaveButtons()
{
- /* prevent enabling of the save buttons when data modified, if there is an invalid proxy address present */
- if(fProxyIpValid)
+ /* prevent enabling of the save buttons when data modified. */
setSaveButtonState(true);
}
@@ -187,15 +168,6 @@ void OptionsDialog::on_applyButton_clicked()
disableApplyButton();
}
-void OptionsDialog::showRestartWarning_Proxy()
-{
- if(!fRestartWarningDisplayed_Proxy)
- {
- QMessageBox::warning(this, tr("Warning"), tr("This setting will take effect after restarting DigitalNote."), QMessageBox::Ok);
- fRestartWarningDisplayed_Proxy = true;
- }
-}
-
void OptionsDialog::showRestartWarning_Lang()
{
if(!fRestartWarningDisplayed_Lang)
@@ -214,35 +186,10 @@ void OptionsDialog::updateDisplayUnit()
}
}
-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 18469f50..ed1b3749 100644
--- a/src/qt/optionsdialog.h
+++ b/src/qt/optionsdialog.h
@@ -40,21 +40,15 @@ private slots:
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
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index d0ac0f22..f8ad0d1e 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -14,7 +14,7 @@
#include "walletdb.h"
#endif
-#include
+
#include
#include
@@ -107,19 +107,6 @@ void OptionsModel::Init()
if (!SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool()))
addOverriddenOption("-upnp");
- if (!settings.contains("fUseProxy"))
- settings.setValue("fUseProxy", false);
- if (!settings.contains("addrProxy"))
- settings.setValue("addrProxy", "127.0.0.1:9050");
- // Only try to set -proxy, if user has enabled fUseProxy
- if (settings.value("fUseProxy").toBool() && !SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()))
- addOverriddenOption("-proxy");
- if (!settings.contains("nSocksVersion"))
- settings.setValue("nSocksVersion", 5);
- // Only try to set -socks, if user has enabled fUseProxy
- if (settings.value("fUseProxy").toBool() && !SoftSetArg("-socks", settings.value("nSocksVersion").toString().toStdString()))
- addOverriddenOption("-socks");
-
// Display
if (!settings.contains("language"))
settings.setValue("language", "");
@@ -169,22 +156,6 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
case MinimizeOnClose:
return fMinimizeOnClose;
- // default proxy
- case ProxyUse:
- return settings.value("fUseProxy", false);
- case ProxyIP: {
- // contains IP at index 0 and port at index 1
- QStringList strlIpPort = settings.value("addrProxy").toString().split(":", QString::SkipEmptyParts);
- return strlIpPort.at(0);
- }
- case ProxyPort: {
- // contains IP at index 0 and port at index 1
- QStringList strlIpPort = settings.value("addrProxy").toString().split(":", QString::SkipEmptyParts);
- return strlIpPort.at(1);
- }
- case ProxySocksVersion:
- return settings.value("nSocksVersion", 5);
-
#ifdef ENABLE_WALLET
case Fee:
// Attention: Init() is called before nTransactionFee is set in AppInit2()!
@@ -242,44 +213,6 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
settings.setValue("fMinimizeOnClose", fMinimizeOnClose);
break;
- // default proxy
- case ProxyUse:
- if (settings.value("fUseProxy") != value) {
- settings.setValue("fUseProxy", value.toBool());
- setRestartRequired(true);
- }
- break;
- case ProxyIP: {
- // contains current IP at index 0 and current port at index 1
- QStringList strlIpPort = settings.value("addrProxy").toString().split(":", QString::SkipEmptyParts);
- // if that key doesn't exist or has a changed IP
- if (!settings.contains("addrProxy") || strlIpPort.at(0) != value.toString()) {
- // construct new value from new IP and current port
- QString strNewValue = value.toString() + ":" + strlIpPort.at(1);
- settings.setValue("addrProxy", strNewValue);
- setRestartRequired(true);
- }
- }
- break;
- case ProxyPort: {
- // contains current IP at index 0 and current port at index 1
- QStringList strlIpPort = settings.value("addrProxy").toString().split(":", QString::SkipEmptyParts);
- // if that key doesn't exist or has a changed port
- if (!settings.contains("addrProxy") || strlIpPort.at(1) != value.toString()) {
- // construct new value from current IP and new port
- QString strNewValue = strlIpPort.at(0) + ":" + value.toString();
- settings.setValue("addrProxy", strNewValue);
- setRestartRequired(true);
- }
- }
- break;
- case ProxySocksVersion: {
- if (settings.value("nSocksVersion") != value) {
- settings.setValue("nSocksVersion", value.toInt());
- setRestartRequired(true);
- }
- }
- break;
#ifdef ENABLE_WALLET
case Fee: // core option - can be changed on-the-fly
// Todo: Add is valid check and warn via message, if not
@@ -332,33 +265,6 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
return successful;
}
-bool OptionsModel::getProxySettings(QNetworkProxy& proxy) const
-{
- // Directly query current base proxy, because
- // GUI settings can be overridden with -proxy.
- proxyType curProxy;
- if (GetProxy(NET_IPV4, curProxy)) {
- if (curProxy.second == 5) {
- proxy.setType(QNetworkProxy::Socks5Proxy);
- proxy.setHostName(QString::fromStdString(curProxy.first.ToStringIP()));
- proxy.setPort(curProxy.first.GetPort());
-
- return true;
- }
- else
- return false;
- }
- else
- proxy.setType(QNetworkProxy::NoProxy);
-
-
-
-
-
-
- return true;
-}
-
void OptionsModel::setRestartRequired(bool fRequired)
{
QSettings settings;
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 3ab0f355..d662d4f9 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -9,10 +9,6 @@
extern bool fUseDarkTheme;
-QT_BEGIN_NAMESPACE
-class QNetworkProxy;
-QT_END_NAMESPACE
-
/** Interface from Qt to configuration data structure for DigitalNote client.
To Qt, the options are presented as a list with the different options
laid out vertically.
@@ -31,10 +27,6 @@ class OptionsModel : public QAbstractListModel
MinimizeToTray, // bool
MapPortUPnP, // bool
MinimizeOnClose, // bool
- ProxyUse, // bool
- ProxyIP, // QString
- ProxyPort, // int
- ProxySocksVersion, // int
Fee, // qint64
ReserveBalance, // qint64
DisplayUnit, // DigitalNoteUnits::Unit
@@ -58,7 +50,6 @@ class OptionsModel : public QAbstractListModel
bool getMinimizeToTray() { return fMinimizeToTray; }
bool getMinimizeOnClose() { return fMinimizeOnClose; }
int getDisplayUnit() { return nDisplayUnit; }
- bool getProxySettings(QNetworkProxy& proxy) const;
bool getCoinControlFeatures() { return fCoinControlFeatures; }
const QString& getOverriddenByCommandLine() { return strOverriddenByCommandLine; }