#include "bitcoinunits.h"
#include <QSettings>
-#include "headers.h"
#include "init.h"
+#include "walletdb.h"
+#include "guiutil.h"
OptionsModel::OptionsModel(QObject *parent) :
QAbstractListModel(parent)
Init();
}
-void OptionsModel::Init()
+bool static ApplyProxySettings()
{
QSettings settings;
+ CService addrProxy(settings.value("addrProxy", "127.0.0.1:9050").toString().toStdString());
+ int nSocksVersion(settings.value("nSocksVersion", 5).toInt());
+ if (!settings.value("fUseProxy", false).toBool()) {
+ addrProxy = CService();
+ nSocksVersion = 0;
+ return false;
+ }
+ if (nSocksVersion && !addrProxy.IsValid())
+ return false;
- // These are QT-only settings:
- nDisplayUnit = settings.value("nDisplayUnit", BitcoinUnits::BTC).toInt();
- bDisplayAddresses = settings.value("bDisplayAddresses", false).toBool();
- fMinimizeToTray = settings.value("fMinimizeToTray", false).toBool();
- fMinimizeOnClose = settings.value("fMinimizeOnClose", false).toBool();
- nTransactionFee = settings.value("nTransactionFee").toLongLong();
+ if (!IsLimited(NET_IPV4))
+ SetProxy(NET_IPV4, addrProxy, nSocksVersion);
+ if (nSocksVersion > 4) {
+#ifdef USE_IPV6
+ if (!IsLimited(NET_IPV6))
+ SetProxy(NET_IPV6, addrProxy, nSocksVersion);
+#endif
+ }
- // These are shared with core bitcoin; we want
- // 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());
+ SetNameProxy(addrProxy, nSocksVersion);
+
+ return true;
}
-bool OptionsModel::Upgrade()
+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;
- if (settings.contains("bImportFinished"))
- return false; // Already upgraded
+ SetProxy(NET_TOR, addrTor, 5);
+ SetReachable(NET_TOR);
- settings.setValue("bImportFinished", true);
+ return true;
+}
- // Move settings from old wallet.dat (if any):
- CWalletDB walletdb("wallet.dat");
+void OptionsModel::Init()
+{
+ QSettings settings;
- QList<QString> 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<QString> 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());
- }
+ // These are Qt-only settings:
+ nDisplayUnit = settings.value("nDisplayUnit", BitcoinUnits::BTC).toInt();
+ bDisplayAddresses = settings.value("bDisplayAddresses", false).toBool();
+ 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|https://bchain.info/NVC/tx/%s");
}
- try
- {
- CAddress addrProxyAddress;
- if (walletdb.ReadSetting("addrProxy", addrProxyAddress))
- {
- addrProxy = addrProxyAddress;
- settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
- walletdb.EraseSetting("addrProxy");
- }
+ 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();
+ nTransactionFee = settings.value("nTransactionFee").toLongLong();
+ language = settings.value("language", "").toString();
+
+ // These are shared with core Bitcoin; we want
+ // command-line options to override the GUI settings:
+ 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());
}
- catch (std::ios_base::failure &e)
- {
- // 0.6.0rc1 saved this as a CService, which causes failure when parsing as a CAddress
- if (walletdb.ReadSetting("addrProxy", addrProxy))
- {
- settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
- walletdb.EraseSetting("addrProxy");
+
+ if (settings.contains("addrTor") && settings.value("fUseTor").toBool()) {
+ SoftSetArg("-tor", settings.value("addrTor").toString().toStdString());
+ if (settings.value("fTorOnly").toBool())
+ SoftSetArg("-onlynet", "tor");
+
+ if (settings.value("TorName").toString().length() == 22) {
+ std::string strTorName = settings.value("TorName").toString().toStdString();
+
+ CService addrTorName(strTorName, GetListenPort());
+ if (addrTorName.IsValid())
+ SoftSetArg("-torname", strTorName);
}
}
- 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;
switch(index.row())
{
case StartAtStartup:
- return QVariant(GetStartOnSystemStartup());
+ return QVariant(GUIUtil::GetStartOnSystemStartup());
case MinimizeToTray:
return QVariant(fMinimizeToTray);
- case MapPortUPnP:
- return settings.value("fUseUPnP", GetBoolArg("-upnp", true));
case MinimizeOnClose:
return QVariant(fMinimizeOnClose);
- case ConnectSOCKS4:
+ case ProxyUse:
return settings.value("fUseProxy", false);
- case ProxyIP:
- return QVariant(QString::fromStdString(addrProxy.ToStringIP()));
- case ProxyPort:
- return QVariant(addrProxy.GetPort());
+ case ProxyIP: {
+ proxyType proxy;
+ if (GetProxy(NET_IPV4, proxy))
+ return QVariant(QString::fromStdString(proxy.first.ToStringIP()));
+ else
+ return QVariant(QString::fromStdString("127.0.0.1"));
+ }
+ case ProxyPort: {
+ proxyType proxy;
+ if (GetProxy(NET_IPV4, proxy))
+ return QVariant(proxy.first.GetPort());
+ else
+ return QVariant(nSocksDefault);
+ }
+ 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(nSocksDefault);
+ }
+ case TorOnly:
+ return settings.value("fTorOnly", false);
+ case TorName:
+ return settings.value("TorName", "");
case Fee:
- return QVariant(nTransactionFee);
+ return QVariant(static_cast<qlonglong>(nTransactionFee));
case DisplayUnit:
return QVariant(nDisplayUnit);
case DisplayAddresses:
return QVariant(bDisplayAddresses);
+ case ThirdPartyTxUrls:
+ return QVariant(strThirdPartyTxUrls);
+ case DetachDatabases:
+ return QVariant(bitdb.GetDetach());
+ case Language:
+ return settings.value("language", "");
+ case CoinControlFeatures:
+ return QVariant(fCoinControlFeatures);
default:
return QVariant();
}
switch(index.row())
{
case StartAtStartup:
- successful = SetStartOnSystemStartup(value.toBool());
+ successful = GUIUtil::SetStartOnSystemStartup(value.toBool());
break;
case MinimizeToTray:
fMinimizeToTray = value.toBool();
settings.setValue("fMinimizeToTray", fMinimizeToTray);
break;
- case MapPortUPnP:
- {
- bool bUseUPnP = value.toBool();
- settings.setValue("fUseUPnP", bUseUPnP);
- MapPort(bUseUPnP);
- }
- break;
case MinimizeOnClose:
fMinimizeOnClose = value.toBool();
settings.setValue("fMinimizeOnClose", fMinimizeOnClose);
break;
- case ConnectSOCKS4:
- fUseProxy = value.toBool();
- settings.setValue("fUseProxy", fUseProxy);
- break;
- case ProxyIP:
- {
- // Use CAddress to parse and check IP
- CNetAddr addr(value.toString().toStdString());
- if (addr.IsValid())
- {
- addrProxy.SetIP(addr);
- settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
- }
- else
- {
- successful = false;
- }
- }
- break;
- case ProxyPort:
- {
- int nPort = atoi(value.toString().toAscii().data());
- if (nPort > 0 && nPort < std::numeric_limits<unsigned short>::max())
- {
- addrProxy.SetPort(nPort);
- settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
- }
- else
- {
- successful = false;
- }
- }
+ case ProxyUse:
+ settings.setValue("fUseProxy", value.toBool());
+ ApplyProxySettings();
break;
- case Fee: {
+ case ProxyIP: {
+ proxyType proxy;
+ proxy.first = CService("127.0.0.1", nSocksDefault);
+ GetProxy(NET_IPV4, proxy);
+
+ CNetAddr addr(value.toString().toStdString());
+ proxy.first.SetIP(addr);
+ settings.setValue("addrProxy", proxy.first.ToStringIPPort().c_str());
+ successful = ApplyProxySettings();
+ }
+ break;
+ case ProxyPort: {
+ proxyType proxy;
+ proxy.first = CService("127.0.0.1", nSocksDefault);
+ GetProxy(NET_IPV4, proxy);
+
+ proxy.first.SetPort(value.toInt());
+ settings.setValue("addrProxy", proxy.first.ToStringIPPort().c_str());
+ successful = ApplyProxySettings();
+ }
+ break;
+ case ProxySocksVersion: {
+ proxyType proxy;
+ proxy.second = 5;
+ GetProxy(NET_IPV4, proxy);
+
+ proxy.second = value.toInt();
+ settings.setValue("nSocksVersion", proxy.second);
+ successful = ApplyProxySettings();
+ }
+ break;
+ case TorUse: {
+ settings.setValue("fUseTor", value.toBool());
+ ApplyTorSettings();
+ }
+ break;
+ case TorIP: {
+ proxyType proxy;
+ proxy.first = CService("127.0.0.1", nSocksDefault);
+ GetProxy(NET_TOR, 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", nSocksDefault);
+ GetProxy(NET_TOR, proxy);
+
+ proxy.first.SetPort((uint16_t)value.toUInt());
+ 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<qlonglong>(nTransactionFee));
+ emit transactionFeeChanged(nTransactionFee);
break;
- case DisplayUnit: {
- int unit = value.toInt();
- nDisplayUnit = unit;
+ case DisplayUnit:
+ nDisplayUnit = value.toInt();
settings.setValue("nDisplayUnit", nDisplayUnit);
- emit displayUnitChanged(unit);
- }
+ emit displayUnitChanged(nDisplayUnit);
break;
- case DisplayAddresses: {
+ case DisplayAddresses:
bDisplayAddresses = value.toBool();
settings.setValue("bDisplayAddresses", bDisplayAddresses);
+ break;
+ case DetachDatabases: {
+ bool fDetachDB = value.toBool();
+ bitdb.SetDetach(fDetachDB);
+ settings.setValue("detachDB", fDetachDB);
+ }
+ break;
+ case ThirdPartyTxUrls:
+ if (strThirdPartyTxUrls != value.toString()) {
+ strThirdPartyTxUrls = value.toString();
+ settings.setValue("strThirdPartyTxUrls", strThirdPartyTxUrls);
+ }
+ break;
+ case Language:
+ settings.setValue("language", value);
+ break;
+ case CoinControlFeatures: {
+ fCoinControlFeatures = value.toBool();
+ settings.setValue("fCoinControlFeatures", fCoinControlFeatures);
+ emit coinControlFeaturesChanged(fCoinControlFeatures);
}
break;
default:
return nTransactionFee;
}
+bool OptionsModel::getCoinControlFeatures()
+{
+ return fCoinControlFeatures;
+}
+
bool OptionsModel::getMinimizeToTray()
{
return fMinimizeToTray;
git://git.novaco.in / novacoin.git / blobdiff