X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fqt%2Foptionsdialog.cpp;h=0f92918dbe3bedd3f0c60d88fff580bfc9834aed;hb=HEAD;hp=20189a7d33b274696ae0bca6b235e6de1b98dab4;hpb=9ca8b78544b413ed875ff9bb6ef376e21922e6ac;p=novacoin.git diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 20189a7..0f92918 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -5,6 +5,7 @@ #include "monitoreddatamapper.h" #include "netbase.h" #include "optionsmodel.h" +#include "dialogwindowflags.h" #include #include @@ -12,27 +13,40 @@ #include #include #include +#include +#include + +#if QT_VERSION < 0x050000 +#include +#else +#include +#endif OptionsDialog::OptionsDialog(QWidget *parent) : - QDialog(parent), + QWidget(parent, DIALOGWINDOWHINTS), ui(new Ui::OptionsDialog), model(0), mapper(0), fRestartWarningDisplayed_Proxy(false), + fRestartWarningDisplayed_Tor(false), fRestartWarningDisplayed_Lang(false), - fProxyIpValid(true) + fRestartWarningDisplayed_URL(false), + fProxyIpValid(true), + fTorIpValid(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->torIp->setEnabled(false); + ui->torPort->setEnabled(false); + ui->torPort->setValidator(new QIntValidator(1, 65535, this)); + ui->TorOnly->setEnabled(false); + ui->torName->setEnabled(false); + ui->socksVersion->setEnabled(false); ui->socksVersion->addItem("5", 5); ui->socksVersion->addItem("4", 4); @@ -43,7 +57,15 @@ OptionsDialog::OptionsDialog(QWidget *parent) : connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->socksVersion, SLOT(setEnabled(bool))); connect(ui->connectSocks, SIGNAL(clicked(bool)), this, SLOT(showRestartWarning_Proxy())); + connect(ui->connectTor, SIGNAL(clicked(bool)), this, SLOT(showRestartWarning_Tor())); + connect(ui->connectTor, SIGNAL(toggled(bool)), ui->torIp, SLOT(setEnabled(bool))); + connect(ui->connectTor, SIGNAL(toggled(bool)), ui->torPort, SLOT(setEnabled(bool))); + connect(ui->connectTor, SIGNAL(toggled(bool)), ui->TorOnly, SLOT(setEnabled(bool))); + connect(ui->connectTor, SIGNAL(toggled(bool)), ui->torName, SLOT(setEnabled(bool))); + connect(ui->TorOnly, SIGNAL(toggled(bool)), ui->connectSocks, SLOT(setDisabled(bool))); + ui->proxyIp->installEventFilter(this); + ui->torIp->installEventFilter(this); /* Window elements init */ #ifdef Q_OS_MAC @@ -80,6 +102,11 @@ OptionsDialog::OptionsDialog(QWidget *parent) : } } +#if QT_VERSION >= 0x040700 + ui->thirdPartyTxUrls->setPlaceholderText("https://example.com/tx/%s"); +#endif + + ui->unit->setModel(new BitcoinUnits(this)); /* Widget-to-option mapper */ @@ -93,6 +120,8 @@ OptionsDialog::OptionsDialog(QWidget *parent) : 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))); + /* setup/change UI elements when Tor IP is invalid/valid */ + connect(this, SIGNAL(torIpValid(QValidatedLineEdit *, bool)), this, SLOT(handleTorIpValid(QValidatedLineEdit *, bool))); } OptionsDialog::~OptionsDialog() @@ -118,6 +147,7 @@ void OptionsDialog::setModel(OptionsModel *model) /* 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())); + connect(ui->thirdPartyTxUrls, SIGNAL(textChanged(const QString &)), this, SLOT(showRestartWarning_URL())); /* disable apply button after settings are loaded as there is nothing to save */ disableApplyButton(); @@ -128,16 +158,21 @@ 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); + mapper->addMapping(ui->connectTor, OptionsModel::TorUse); + mapper->addMapping(ui->torIp, OptionsModel::TorIP); + mapper->addMapping(ui->torPort, OptionsModel::TorPort); + mapper->addMapping(ui->TorOnly, OptionsModel::TorOnly); + mapper->addMapping(ui->torName, OptionsModel::TorName); + mapper->addMapping(ui->externalSeederCommand, OptionsModel::ExternalSeeder); + + /* Window */ #ifndef Q_OS_MAC mapper->addMapping(ui->minimizeToTray, OptionsModel::MinimizeToTray); @@ -149,6 +184,7 @@ void OptionsDialog::setMapper() mapper->addMapping(ui->unit, OptionsModel::DisplayUnit); mapper->addMapping(ui->displayAddresses, OptionsModel::DisplayAddresses); mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures); + mapper->addMapping(ui->thirdPartyTxUrls, OptionsModel::ThirdPartyTxUrls); } void OptionsDialog::enableApplyButton() @@ -164,7 +200,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) + if(fProxyIpValid && fTorIpValid) setSaveButtonState(true); } @@ -182,12 +218,14 @@ void OptionsDialog::setSaveButtonState(bool fState) void OptionsDialog::on_okButton_clicked() { mapper->submit(); - accept(); +// accept(); + close(); } void OptionsDialog::on_cancelButton_clicked() { - reject(); +// reject(); + close(); } void OptionsDialog::on_applyButton_clicked() @@ -205,6 +243,15 @@ void OptionsDialog::showRestartWarning_Proxy() } } +void OptionsDialog::showRestartWarning_Tor() +{ + if(!fRestartWarningDisplayed_Proxy) + { + QMessageBox::warning(this, tr("Warning"), tr("This setting will take effect after restarting NovaCoin."), QMessageBox::Ok); + fRestartWarningDisplayed_Tor = true; + } +} + void OptionsDialog::showRestartWarning_Lang() { if(!fRestartWarningDisplayed_Lang) @@ -214,6 +261,16 @@ void OptionsDialog::showRestartWarning_Lang() } } +void OptionsDialog::showRestartWarning_URL() +{ + if(!fRestartWarningDisplayed_URL) + { + QMessageBox::warning(this, tr("Warning"), tr("This setting will take effect after restarting NovaCoin."), QMessageBox::Ok); + fRestartWarningDisplayed_URL = true; + } +} + + void OptionsDialog::updateDisplayUnit() { if(model) @@ -242,6 +299,25 @@ void OptionsDialog::handleProxyIpValid(QValidatedLineEdit *object, bool fState) } } +void OptionsDialog::handleTorIpValid(QValidatedLineEdit *object, bool fState) +{ + // this is used in a check before re-enabling the save buttons + fTorIpValid = fState; + + if(fTorIpValid) + { + enableSaveButtons(); + ui->statusLabel->clear(); + } + else + { + disableSaveButtons(); + object->setValid(fTorIpValid); + ui->statusLabel->setStyleSheet("QLabel { color: red; }"); + ui->statusLabel->setText(tr("The supplied tor address is invalid.")); + } +} + bool OptionsDialog::eventFilter(QObject *object, QEvent *event) { if(event->type() == QEvent::FocusOut) @@ -252,6 +328,41 @@ bool OptionsDialog::eventFilter(QObject *object, QEvent *event) /* 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)); } + + if(object == ui->torIp) + { + CService addr; + /* Check proxyIp for a valid IPv4/IPv6 address and emit the torIpValid signal */ + emit torIpValid(ui->torIp, LookupNumeric(ui->torIp->text().toStdString().c_str(), addr)); + } + } + return QWidget::eventFilter(object, event); +} + +void OptionsDialog::keyPressEvent(QKeyEvent *event) +{ +#ifdef ANDROID + if(windowType() != Qt::Widget && event->key() == Qt::Key_Back) + { + close(); + } +#else + if(windowType() != Qt::Widget && event->key() == Qt::Key_Escape) + { + close(); + } +#endif +} +void OptionsDialog::on_chooseSeeder_clicked() +{ +#if QT_VERSION < 0x050000 + QString openDir = QDesktopServices::storageLocation(QDesktopServices::ApplicationsLocation); +#else + QString openDir = QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation); +#endif + + QString filename = QFileDialog::getOpenFileName(this, tr("Choose peer collector application"), openDir, tr("Applications (*.*)")); + if(!filename.isEmpty()) { + ui->externalSeederCommand->setText(filename); } - return QDialog::eventFilter(object, event); }