X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fqt%2Foptionsmodel.cpp;h=664de32cd418dd6b05a73e65d4a49007734dec38;hb=52c85881648d3381c29da10925c06cbd083cc570;hp=1b932196ce02fc96c7c308154ba48ec7c3446037;hpb=94804ecb3305f240537041fd3f396f867de53b3f;p=novacoin.git diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 1b93219..664de32 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -24,6 +24,7 @@ bool static ApplyProxySettings() } if (nSocksVersion && !addrProxy.IsValid()) return false; + if (!IsLimited(NET_IPV4)) SetProxy(NET_IPV4, addrProxy, nSocksVersion); if (nSocksVersion > 4) { @@ -31,8 +32,27 @@ bool static ApplyProxySettings() if (!IsLimited(NET_IPV6)) SetProxy(NET_IPV6, addrProxy, nSocksVersion); #endif - SetNameProxy(addrProxy, nSocksVersion); } + + SetNameProxy(addrProxy, nSocksVersion); + + return true; +} + +bool static ApplyTorSettings() +{ + QSettings settings; + CService addrTor(settings.value("addrTor", "127.0.0.1:9050").toString().toStdString()); + if (!settings.value("fUseTor", false).toBool()) { + addrTor = CService(); + return false; + } + if (!addrTor.IsValid()) + return false; + + SetProxy(NET_TOR, addrTor, 5); + SetReachable(NET_TOR); + return true; } @@ -43,12 +63,13 @@ void OptionsModel::Init() // These are Qt-only settings: nDisplayUnit = settings.value("nDisplayUnit", BitcoinUnits::BTC).toInt(); bDisplayAddresses = settings.value("bDisplayAddresses", false).toBool(); - if (!settings.contains("strThirdPartyTxUrls")) + if (!settings.contains("strThirdPartyTxUrls")) { if(fTestNet) settings.setValue("strThirdPartyTxUrls", ""); else - settings.setValue("strThirdPartyTxUrls", "https://bitinfocharts.com/novacoin/tx/%s|https://coinplorer.com/NVC/Transactions/%s|https://explorer.novaco.in/tx/%s"); - strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "https://bitinfocharts.com/novacoin/tx/%s|https://coinplorer.com/NVC/Transactions/%s|https://explorer.novaco.in/tx/%s").toString(); + settings.setValue("strThirdPartyTxUrls", "https://bitinfocharts.com/novacoin/tx/%s|https://coinplorer.com/NVC/Transactions/%s|https://explorer.novaco.in/tx/%s|https://bchain.info/NVC/tx/%s"); + } + strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "https://bitinfocharts.com/novacoin/tx/%s|https://coinplorer.com/NVC/Transactions/%s|https://explorer.novaco.in/tx/%s|https://bchain.info/NVC/tx/%s").toString(); fMinimizeToTray = settings.value("fMinimizeToTray", false).toBool(); fMinimizeOnClose = settings.value("fMinimizeOnClose", false).toBool(); fCoinControlFeatures = settings.value("fCoinControlFeatures", false).toBool(); @@ -59,76 +80,33 @@ void OptionsModel::Init() // command-line options to override the GUI settings: if (settings.contains("fUseUPnP")) SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool()); - if (settings.contains("addrProxy") && settings.value("fUseProxy").toBool()) - SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()); - if (settings.contains("nSocksVersion") && settings.value("fUseProxy").toBool()) - SoftSetArg("-socks", settings.value("nSocksVersion").toString().toStdString()); - if (settings.contains("detachDB")) - SoftSetBoolArg("-detachdb", settings.value("detachDB").toBool()); - if (!language.isEmpty()) - SoftSetArg("-lang", language.toStdString()); -} - -bool OptionsModel::Upgrade() -{ - QSettings settings; - - if (settings.contains("bImportFinished")) - return false; // Already upgraded + if ( !(settings.value("fTorOnly").toBool() && settings.contains("addrTor")) ) { + if (settings.contains("addrProxy") && settings.value("fUseProxy").toBool()) + SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()); + if (settings.contains("nSocksVersion") && settings.value("fUseProxy").toBool()) + SoftSetArg("-socks", settings.value("nSocksVersion").toString().toStdString()); + } - settings.setValue("bImportFinished", true); + if (settings.contains("addrTor") && settings.value("fUseTor").toBool()) { + SoftSetArg("-tor", settings.value("addrTor").toString().toStdString()); + if (settings.value("fTorOnly").toBool()) + SoftSetArg("-onlynet", "tor"); - // Move settings from old wallet.dat (if any): - CWalletDB walletdb(strWalletFileName); + if (settings.value("TorName").toString().length() == 22) { + std::string strTorName = settings.value("TorName").toString().toStdString(); - QList intOptions; - intOptions << "nDisplayUnit" << "nTransactionFee"; - foreach(QString key, intOptions) - { - int value = 0; - if (walletdb.ReadSetting(key.toStdString(), value)) - { - settings.setValue(key, value); - walletdb.EraseSetting(key.toStdString()); - } - } - QList boolOptions; - boolOptions << "bDisplayAddresses" << "fMinimizeToTray" << "fMinimizeOnClose" << "fUseProxy" << "fUseUPnP"; - foreach(QString key, boolOptions) - { - bool value = false; - if (walletdb.ReadSetting(key.toStdString(), value)) - { - settings.setValue(key, value); - walletdb.EraseSetting(key.toStdString()); - } - } - try - { - CAddress addrProxyAddress; - if (walletdb.ReadSetting("addrProxy", addrProxyAddress)) - { - settings.setValue("addrProxy", addrProxyAddress.ToStringIPPort().c_str()); - walletdb.EraseSetting("addrProxy"); - } - } - catch (std::ios_base::failure &e) - { - // 0.6.0rc1 saved this as a CService, which causes failure when parsing as a CAddress - CService addrProxy; - if (walletdb.ReadSetting("addrProxy", addrProxy)) - { - settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str()); - walletdb.EraseSetting("addrProxy"); + CService addrTorName(strTorName, GetListenPort()); + if (addrTorName.IsValid()) + SoftSetArg("-torname", strTorName); } } - ApplyProxySettings(); - Init(); - return true; + if (settings.contains("detachDB")) + SoftSetBoolArg("-detachdb", settings.value("detachDB").toBool()); + if (!language.isEmpty()) + SoftSetArg("-lang", language.toStdString()); } - int OptionsModel::rowCount(const QModelIndex & parent) const { return OptionIDRowCount; @@ -167,8 +145,28 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const } case ProxySocksVersion: return settings.value("nSocksVersion", 5); + case TorUse: + return settings.value("fUseTor", false); + case TorIP: { + proxyType proxy; + if (GetProxy(NET_TOR, proxy)) + return QVariant(QString::fromStdString(proxy.first.ToStringIP())); + else + return QVariant(QString::fromStdString("127.0.0.1")); + } + case TorPort: { + proxyType proxy; + if (GetProxy(NET_TOR, proxy)) + return QVariant(proxy.first.GetPort()); + else + return QVariant(9050); + } + case TorOnly: + return settings.value("fTorOnly", false); + case TorName: + return settings.value("TorName", ""); case Fee: - return QVariant(nTransactionFee); + return QVariant(static_cast(nTransactionFee)); case DisplayUnit: return QVariant(nDisplayUnit); case DisplayAddresses: @@ -247,9 +245,43 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in successful = ApplyProxySettings(); } break; + case TorUse: { + settings.setValue("fUseTor", value.toBool()); + ApplyTorSettings(); + } + break; + case TorIP: { + proxyType proxy; + proxy.first = CService("127.0.0.1", 9050); + GetProxy(NET_IPV4, proxy); + + CNetAddr addr(value.toString().toStdString()); + proxy.first.SetIP(addr); + settings.setValue("addrTor", proxy.first.ToStringIPPort().c_str()); + successful = ApplyTorSettings(); + } + break; + case TorPort: { + proxyType proxy; + proxy.first = CService("127.0.0.1", 9050); + GetProxy(NET_IPV4, proxy); + + proxy.first.SetPort(value.toInt()); + settings.setValue("addrTor", proxy.first.ToStringIPPort().c_str()); + successful = ApplyTorSettings(); + } + break; + case TorOnly: { + settings.setValue("fTorOnly", value.toBool()); + ApplyTorSettings(); + } + case TorName: { + settings.setValue("TorName", value.toString()); + } + break; case Fee: nTransactionFee = value.toLongLong(); - settings.setValue("nTransactionFee", nTransactionFee); + settings.setValue("nTransactionFee", static_cast(nTransactionFee)); emit transactionFeeChanged(nTransactionFee); break; case DisplayUnit: