X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fqt%2Foptionsmodel.cpp;h=5dcf9df98d5ca397bab0774416b2902ed4cfb763;hb=f8ea0dd6459856f2df18ca2ad532d49432a087dd;hp=71203f5ac25f2f35f220f64003b83864ce029abe;hpb=64f815a4a18993c77629234a4d09dd2adfedaec7;p=novacoin.git diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 71203f5..5dcf9df 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -67,9 +67,9 @@ void OptionsModel::Init() 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"); + settings.setValue("strThirdPartyTxUrls", "https://bitinfocharts.com/novacoin/tx/%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(); + strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "https://bitinfocharts.com/novacoin/tx/%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(); @@ -78,8 +78,6 @@ void OptionsModel::Init() // 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.value("fTorOnly").toBool() && settings.contains("addrTor")) ) { if (settings.contains("addrProxy") && settings.value("fUseProxy").toBool()) SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()); @@ -101,86 +99,16 @@ void OptionsModel::Init() } } + if (!fTestNet && settings.contains("externalSeeder") && settings.value("externalSeeder").toString() != "") { + SoftSetArg("-peercollector", settings.value("externalSeeder").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 - - settings.setValue("bImportFinished", true); - - // Move settings from old wallet.dat (if any): - CWalletDB walletdb(strWalletFileName); - - 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" << "fUseTor" << "fTorOnly" << "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, addrTorAddress; - if (walletdb.ReadSetting("addrProxy", addrProxyAddress)) - { - settings.setValue("addrProxy", addrProxyAddress.ToStringIPPort().c_str()); - walletdb.EraseSetting("addrProxy"); - } - - if (walletdb.ReadSetting("addrTor", addrTorAddress)) - { - settings.setValue("addrTor", addrTorAddress.ToStringIPPort().c_str()); - walletdb.EraseSetting("addrTor"); - } - } - catch (std::ios_base::failure &e) - { - // 0.6.0rc1 saved this as a CService, which causes failure when parsing as a CAddress - CService addrProxy, addrTor; - if (walletdb.ReadSetting("addrProxy", addrProxy)) - { - settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str()); - walletdb.EraseSetting("addrProxy"); - } - - if (walletdb.ReadSetting("addrTor", addrTor)) - { - settings.setValue("addrTor", addrTor.ToStringIPPort().c_str()); - walletdb.EraseSetting("addrTor"); - } - } - - ApplyProxySettings(); - ApplyTorSettings(); - Init(); - - return true; -} - - int OptionsModel::rowCount(const QModelIndex & parent) const { return OptionIDRowCount; @@ -197,8 +125,6 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const return QVariant(GUIUtil::GetStartOnSystemStartup()); case MinimizeToTray: return QVariant(fMinimizeToTray); - case MapPortUPnP: - return settings.value("fUseUPnP", GetBoolArg("-upnp", true)); case MinimizeOnClose: return QVariant(fMinimizeOnClose); case ProxyUse: @@ -215,7 +141,7 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const if (GetProxy(NET_IPV4, proxy)) return QVariant(proxy.first.GetPort()); else - return QVariant(9050); + return QVariant(nSocksDefault); } case ProxySocksVersion: return settings.value("nSocksVersion", 5); @@ -233,12 +159,14 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const if (GetProxy(NET_TOR, proxy)) return QVariant(proxy.first.GetPort()); else - return QVariant(9050); + return QVariant(nSocksDefault); } case TorOnly: return settings.value("fTorOnly", false); case TorName: return settings.value("TorName", ""); + case ExternalSeeder: + return settings.value("externalSeeder", ""); case Fee: return QVariant(static_cast(nTransactionFee)); case DisplayUnit: @@ -275,11 +203,6 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in fMinimizeToTray = value.toBool(); settings.setValue("fMinimizeToTray", fMinimizeToTray); break; - case MapPortUPnP: - fUseUPnP = value.toBool(); - settings.setValue("fUseUPnP", fUseUPnP); - MapPort(); - break; case MinimizeOnClose: fMinimizeOnClose = value.toBool(); settings.setValue("fMinimizeOnClose", fMinimizeOnClose); @@ -290,7 +213,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in break; case ProxyIP: { proxyType proxy; - proxy.first = CService("127.0.0.1", 9050); + proxy.first = CService("127.0.0.1", nSocksDefault); GetProxy(NET_IPV4, proxy); CNetAddr addr(value.toString().toStdString()); @@ -301,7 +224,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in break; case ProxyPort: { proxyType proxy; - proxy.first = CService("127.0.0.1", 9050); + proxy.first = CService("127.0.0.1", nSocksDefault); GetProxy(NET_IPV4, proxy); proxy.first.SetPort(value.toInt()); @@ -326,8 +249,8 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in break; case TorIP: { proxyType proxy; - proxy.first = CService("127.0.0.1", 9050); - GetProxy(NET_IPV4, proxy); + proxy.first = CService("127.0.0.1", nSocksDefault); + GetProxy(NET_TOR, proxy); CNetAddr addr(value.toString().toStdString()); proxy.first.SetIP(addr); @@ -337,10 +260,10 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in break; case TorPort: { proxyType proxy; - proxy.first = CService("127.0.0.1", 9050); - GetProxy(NET_IPV4, proxy); + proxy.first = CService("127.0.0.1", nSocksDefault); + GetProxy(NET_TOR, proxy); - proxy.first.SetPort(value.toInt()); + proxy.first.SetPort((uint16_t)value.toUInt()); settings.setValue("addrTor", proxy.first.ToStringIPPort().c_str()); successful = ApplyTorSettings(); } @@ -353,6 +276,9 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in settings.setValue("TorName", value.toString()); } break; + case ExternalSeeder: + settings.setValue("externalSeeder", value.toString()); + break; case Fee: nTransactionFee = value.toLongLong(); settings.setValue("nTransactionFee", static_cast(nTransactionFee));