Merge branch 'nooptionsinwallet+fixproxysetting' of https://github.com/sipa/bitcoin
This commit is contained in:
commit
90d78142c0
12 changed files with 187 additions and 143 deletions
|
@ -301,7 +301,7 @@ Value getgenerate(const Array& params, bool fHelp)
|
||||||
"getgenerate\n"
|
"getgenerate\n"
|
||||||
"Returns true or false.");
|
"Returns true or false.");
|
||||||
|
|
||||||
return (bool)fGenerateBitcoins;
|
return GetBoolArg("-gen");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -320,13 +320,11 @@ Value setgenerate(const Array& params, bool fHelp)
|
||||||
if (params.size() > 1)
|
if (params.size() > 1)
|
||||||
{
|
{
|
||||||
int nGenProcLimit = params[1].get_int();
|
int nGenProcLimit = params[1].get_int();
|
||||||
fLimitProcessors = (nGenProcLimit != -1);
|
mapArgs["-genproclimit"] = itostr(nGenProcLimit);
|
||||||
WriteSetting("fLimitProcessors", fLimitProcessors);
|
|
||||||
if (nGenProcLimit != -1)
|
|
||||||
WriteSetting("nLimitProcessors", nLimitProcessors = nGenProcLimit);
|
|
||||||
if (nGenProcLimit == 0)
|
if (nGenProcLimit == 0)
|
||||||
fGenerate = false;
|
fGenerate = false;
|
||||||
}
|
}
|
||||||
|
mapArgs["-gen"] = (fGenerate ? "1" : "0");
|
||||||
|
|
||||||
GenerateBitcoins(fGenerate, pwalletMain);
|
GenerateBitcoins(fGenerate, pwalletMain);
|
||||||
return Value::null;
|
return Value::null;
|
||||||
|
@ -385,8 +383,8 @@ Value getmininginfo(const Array& params, bool fHelp)
|
||||||
obj.push_back(Pair("currentblocktx",(uint64_t)nLastBlockTx));
|
obj.push_back(Pair("currentblocktx",(uint64_t)nLastBlockTx));
|
||||||
obj.push_back(Pair("difficulty", (double)GetDifficulty()));
|
obj.push_back(Pair("difficulty", (double)GetDifficulty()));
|
||||||
obj.push_back(Pair("errors", GetWarnings("statusbar")));
|
obj.push_back(Pair("errors", GetWarnings("statusbar")));
|
||||||
obj.push_back(Pair("generate", (bool)fGenerateBitcoins));
|
obj.push_back(Pair("generate", GetBoolArg("-gen")));
|
||||||
obj.push_back(Pair("genproclimit", (int)(fLimitProcessors ? nLimitProcessors : -1)));
|
obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1)));
|
||||||
obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
|
obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
|
||||||
obj.push_back(Pair("pooledtx", (uint64_t)nPooledTx));
|
obj.push_back(Pair("pooledtx", (uint64_t)nPooledTx));
|
||||||
obj.push_back(Pair("testnet", fTestNet));
|
obj.push_back(Pair("testnet", fTestNet));
|
||||||
|
|
33
src/db.cpp
33
src/db.cpp
|
@ -768,13 +768,6 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
|
||||||
vector<uint256> vWalletUpgrade;
|
vector<uint256> vWalletUpgrade;
|
||||||
bool fIsEncrypted = false;
|
bool fIsEncrypted = false;
|
||||||
|
|
||||||
// Modify defaults
|
|
||||||
#ifndef WIN32
|
|
||||||
// Tray icon sometimes disappears on 9.10 karmic koala 64-bit, leaving no way to access the program
|
|
||||||
fMinimizeToTray = false;
|
|
||||||
fMinimizeOnClose = false;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//// todo: shouldn't we catch exceptions and try to recover and continue?
|
//// todo: shouldn't we catch exceptions and try to recover and continue?
|
||||||
CRITICAL_BLOCK(pwallet->cs_wallet)
|
CRITICAL_BLOCK(pwallet->cs_wallet)
|
||||||
{
|
{
|
||||||
|
@ -916,24 +909,6 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
|
||||||
if (nFileVersion == 10300)
|
if (nFileVersion == 10300)
|
||||||
nFileVersion = 300;
|
nFileVersion = 300;
|
||||||
}
|
}
|
||||||
else if (strType == "setting")
|
|
||||||
{
|
|
||||||
string strKey;
|
|
||||||
ssKey >> strKey;
|
|
||||||
|
|
||||||
// Options
|
|
||||||
#ifndef QT_GUI
|
|
||||||
if (strKey == "fGenerateBitcoins") ssValue >> fGenerateBitcoins;
|
|
||||||
#endif
|
|
||||||
if (strKey == "nTransactionFee") ssValue >> nTransactionFee;
|
|
||||||
if (strKey == "fLimitProcessors") ssValue >> fLimitProcessors;
|
|
||||||
if (strKey == "nLimitProcessors") ssValue >> nLimitProcessors;
|
|
||||||
if (strKey == "fMinimizeToTray") ssValue >> fMinimizeToTray;
|
|
||||||
if (strKey == "fMinimizeOnClose") ssValue >> fMinimizeOnClose;
|
|
||||||
if (strKey == "fUseProxy") ssValue >> fUseProxy;
|
|
||||||
if (strKey == "addrProxy") ssValue >> addrProxy;
|
|
||||||
if (fHaveUPnP && strKey == "fUseUPnP") ssValue >> fUseUPnP;
|
|
||||||
}
|
|
||||||
else if (strType == "minversion")
|
else if (strType == "minversion")
|
||||||
{
|
{
|
||||||
int nMinVersion = 0;
|
int nMinVersion = 0;
|
||||||
|
@ -959,14 +934,6 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
|
||||||
WriteTx(hash, pwallet->mapWallet[hash]);
|
WriteTx(hash, pwallet->mapWallet[hash]);
|
||||||
|
|
||||||
printf("nFileVersion = %d\n", nFileVersion);
|
printf("nFileVersion = %d\n", nFileVersion);
|
||||||
printf("fGenerateBitcoins = %d\n", fGenerateBitcoins);
|
|
||||||
printf("nTransactionFee = %"PRI64d"\n", nTransactionFee);
|
|
||||||
printf("fMinimizeToTray = %d\n", fMinimizeToTray);
|
|
||||||
printf("fMinimizeOnClose = %d\n", fMinimizeOnClose);
|
|
||||||
printf("fUseProxy = %d\n", fUseProxy);
|
|
||||||
printf("addrProxy = %s\n", addrProxy.ToString().c_str());
|
|
||||||
if (fHaveUPnP)
|
|
||||||
printf("fUseUPnP = %d\n", fUseUPnP);
|
|
||||||
|
|
||||||
|
|
||||||
// Rewrite encrypted wallets of versions 0.4.0 and 0.5.0rc:
|
// Rewrite encrypted wallets of versions 0.4.0 and 0.5.0rc:
|
||||||
|
|
8
src/db.h
8
src/db.h
|
@ -473,18 +473,24 @@ public:
|
||||||
return Erase(std::make_pair(std::string("pool"), nPool));
|
return Erase(std::make_pair(std::string("pool"), nPool));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Settings are no longer stored in wallet.dat; these are
|
||||||
|
// used only for backwards compatibility:
|
||||||
template<typename T>
|
template<typename T>
|
||||||
bool ReadSetting(const std::string& strKey, T& value)
|
bool ReadSetting(const std::string& strKey, T& value)
|
||||||
{
|
{
|
||||||
return Read(std::make_pair(std::string("setting"), strKey), value);
|
return Read(std::make_pair(std::string("setting"), strKey), value);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
bool WriteSetting(const std::string& strKey, const T& value)
|
bool WriteSetting(const std::string& strKey, const T& value)
|
||||||
{
|
{
|
||||||
nWalletDBUpdated++;
|
nWalletDBUpdated++;
|
||||||
return Write(std::make_pair(std::string("setting"), strKey), value);
|
return Write(std::make_pair(std::string("setting"), strKey), value);
|
||||||
}
|
}
|
||||||
|
bool EraseSetting(const std::string& strKey)
|
||||||
|
{
|
||||||
|
nWalletDBUpdated++;
|
||||||
|
return Erase(std::make_pair(std::string("setting"), strKey));
|
||||||
|
}
|
||||||
|
|
||||||
bool WriteMinVersion(int nVersion)
|
bool WriteMinVersion(int nVersion)
|
||||||
{
|
{
|
||||||
|
|
27
src/init.cpp
27
src/init.cpp
|
@ -150,27 +150,15 @@ bool AppInit2(int argc, char* argv[])
|
||||||
//
|
//
|
||||||
// Parameters
|
// Parameters
|
||||||
//
|
//
|
||||||
// If Qt is used, parameters are parsed in qt/bitcoin.cpp's main()
|
// If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main()
|
||||||
#if !defined(QT_GUI)
|
#if !defined(QT_GUI)
|
||||||
ParseParameters(argc, argv);
|
ParseParameters(argc, argv);
|
||||||
#endif
|
if (!ReadConfigFile(mapArgs, mapMultiArgs))
|
||||||
|
|
||||||
if (mapArgs.count("-datadir"))
|
|
||||||
{
|
|
||||||
if (filesystem::is_directory(filesystem::system_complete(mapArgs["-datadir"])))
|
|
||||||
{
|
|
||||||
filesystem::path pathDataDir = filesystem::system_complete(mapArgs["-datadir"]);
|
|
||||||
strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Error: Specified directory does not exist\n");
|
fprintf(stderr, "Error: Specified directory does not exist\n");
|
||||||
Shutdown(NULL);
|
Shutdown(NULL);
|
||||||
}
|
}
|
||||||
}
|
#endif
|
||||||
|
|
||||||
|
|
||||||
ReadConfigFile(mapArgs, mapMultiArgs); // Must be done after processing datadir
|
|
||||||
|
|
||||||
if (mapArgs.count("-?") || mapArgs.count("--help"))
|
if (mapArgs.count("-?") || mapArgs.count("--help"))
|
||||||
{
|
{
|
||||||
|
@ -473,8 +461,6 @@ bool AppInit2(int argc, char* argv[])
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
fGenerateBitcoins = GetBoolArg("-gen");
|
|
||||||
|
|
||||||
if (mapArgs.count("-proxy"))
|
if (mapArgs.count("-proxy"))
|
||||||
{
|
{
|
||||||
fUseProxy = true;
|
fUseProxy = true;
|
||||||
|
@ -520,13 +506,6 @@ bool AppInit2(int argc, char* argv[])
|
||||||
COINBASE_FLAGS << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH));
|
COINBASE_FLAGS << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Command-line args override in-wallet settings:
|
|
||||||
#if USE_UPNP
|
|
||||||
fUseUPnP = GetBoolArg("-upnp", true);
|
|
||||||
#else
|
|
||||||
fUseUPnP = GetBoolArg("-upnp", false);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!fNoListen)
|
if (!fNoListen)
|
||||||
{
|
{
|
||||||
std::string strError;
|
std::string strError;
|
||||||
|
|
28
src/main.cpp
28
src/main.cpp
|
@ -57,22 +57,12 @@ CScript COINBASE_FLAGS;
|
||||||
|
|
||||||
const string strMessageMagic = "Bitcoin Signed Message:\n";
|
const string strMessageMagic = "Bitcoin Signed Message:\n";
|
||||||
|
|
||||||
|
|
||||||
double dHashesPerSec;
|
double dHashesPerSec;
|
||||||
int64 nHPSTimerStart;
|
int64 nHPSTimerStart;
|
||||||
|
|
||||||
// Settings
|
// Settings
|
||||||
int fGenerateBitcoins = false;
|
|
||||||
int64 nTransactionFee = 0;
|
int64 nTransactionFee = 0;
|
||||||
int fLimitProcessors = false;
|
|
||||||
int nLimitProcessors = 1;
|
|
||||||
int fMinimizeToTray = true;
|
|
||||||
int fMinimizeOnClose = true;
|
|
||||||
#if USE_UPNP
|
|
||||||
int fUseUPnP = true;
|
|
||||||
#else
|
|
||||||
int fUseUPnP = false;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
@ -3289,6 +3279,10 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
|
||||||
|
|
||||||
void static ThreadBitcoinMiner(void* parg);
|
void static ThreadBitcoinMiner(void* parg);
|
||||||
|
|
||||||
|
static bool fGenerateBitcoins = false;
|
||||||
|
static bool fLimitProcessors = false;
|
||||||
|
static int nLimitProcessors = -1;
|
||||||
|
|
||||||
void static BitcoinMiner(CWallet *pwallet)
|
void static BitcoinMiner(CWallet *pwallet)
|
||||||
{
|
{
|
||||||
printf("BitcoinMiner started\n");
|
printf("BitcoinMiner started\n");
|
||||||
|
@ -3463,14 +3457,14 @@ void static ThreadBitcoinMiner(void* parg)
|
||||||
|
|
||||||
|
|
||||||
void GenerateBitcoins(bool fGenerate, CWallet* pwallet)
|
void GenerateBitcoins(bool fGenerate, CWallet* pwallet)
|
||||||
{
|
|
||||||
if (fGenerateBitcoins != fGenerate)
|
|
||||||
{
|
{
|
||||||
fGenerateBitcoins = fGenerate;
|
fGenerateBitcoins = fGenerate;
|
||||||
WriteSetting("fGenerateBitcoins", fGenerateBitcoins);
|
nLimitProcessors = GetArg("-genproclimit", -1);
|
||||||
MainFrameRepaint();
|
if (nLimitProcessors == 0)
|
||||||
}
|
fGenerateBitcoins = false;
|
||||||
if (fGenerateBitcoins)
|
fLimitProcessors = (nLimitProcessors != -1);
|
||||||
|
|
||||||
|
if (fGenerate)
|
||||||
{
|
{
|
||||||
int nProcessors = boost::thread::hardware_concurrency();
|
int nProcessors = boost::thread::hardware_concurrency();
|
||||||
printf("%d processors\n", nProcessors);
|
printf("%d processors\n", nProcessors);
|
||||||
|
|
20
src/main.h
20
src/main.h
|
@ -77,13 +77,7 @@ extern CCriticalSection cs_setpwalletRegistered;
|
||||||
extern std::set<CWallet*> setpwalletRegistered;
|
extern std::set<CWallet*> setpwalletRegistered;
|
||||||
|
|
||||||
// Settings
|
// Settings
|
||||||
extern int fGenerateBitcoins;
|
|
||||||
extern int64 nTransactionFee;
|
extern int64 nTransactionFee;
|
||||||
extern int fLimitProcessors;
|
|
||||||
extern int nLimitProcessors;
|
|
||||||
extern int fMinimizeToTray;
|
|
||||||
extern int fMinimizeOnClose;
|
|
||||||
extern int fUseUPnP;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -127,20 +121,6 @@ std::string GetWarnings(std::string strFor);
|
||||||
|
|
||||||
bool GetWalletFile(CWallet* pwallet, std::string &strWalletFileOut);
|
bool GetWalletFile(CWallet* pwallet, std::string &strWalletFileOut);
|
||||||
|
|
||||||
template<typename T>
|
|
||||||
bool WriteSetting(const std::string& strKey, const T& value)
|
|
||||||
{
|
|
||||||
bool fOk = false;
|
|
||||||
BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered)
|
|
||||||
{
|
|
||||||
std::string strWalletFile;
|
|
||||||
if (!GetWalletFile(pwallet, strWalletFile))
|
|
||||||
continue;
|
|
||||||
fOk |= CWalletDB(strWalletFile).WriteSetting(strKey, value);
|
|
||||||
}
|
|
||||||
return fOk;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class CDiskTxPos
|
class CDiskTxPos
|
||||||
{
|
{
|
||||||
|
|
12
src/net.cpp
12
src/net.cpp
|
@ -43,6 +43,7 @@ bool OpenNetworkConnection(const CAddress& addrConnect);
|
||||||
//
|
//
|
||||||
bool fClient = false;
|
bool fClient = false;
|
||||||
bool fAllowDNS = false;
|
bool fAllowDNS = false;
|
||||||
|
static bool fUseUPnP = false;
|
||||||
uint64 nLocalServices = (fClient ? 0 : NODE_NETWORK);
|
uint64 nLocalServices = (fClient ? 0 : NODE_NETWORK);
|
||||||
CAddress addrLocalHost(CService("0.0.0.0", 0), nLocalServices);
|
CAddress addrLocalHost(CService("0.0.0.0", 0), nLocalServices);
|
||||||
static CNode* pnodeLocalHost = NULL;
|
static CNode* pnodeLocalHost = NULL;
|
||||||
|
@ -1102,7 +1103,6 @@ void MapPort(bool fMapPort)
|
||||||
if (fUseUPnP != fMapPort)
|
if (fUseUPnP != fMapPort)
|
||||||
{
|
{
|
||||||
fUseUPnP = fMapPort;
|
fUseUPnP = fMapPort;
|
||||||
WriteSetting("fUseUPnP", fUseUPnP);
|
|
||||||
}
|
}
|
||||||
if (fUseUPnP && vnThreadsRunning[THREAD_UPNP] < 1)
|
if (fUseUPnP && vnThreadsRunning[THREAD_UPNP] < 1)
|
||||||
{
|
{
|
||||||
|
@ -1711,6 +1711,14 @@ bool BindListenPort(string& strError)
|
||||||
|
|
||||||
void StartNode(void* parg)
|
void StartNode(void* parg)
|
||||||
{
|
{
|
||||||
|
#ifdef USE_UPNP
|
||||||
|
#if USE_UPNP
|
||||||
|
fUseUPnP = GetBoolArg("-upnp", true);
|
||||||
|
#else
|
||||||
|
fUseUPnP = GetBoolArg("-upnp", false);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
if (pnodeLocalHost == NULL)
|
if (pnodeLocalHost == NULL)
|
||||||
pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress(CService("127.0.0.1", 0), nLocalServices));
|
pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress(CService("127.0.0.1", 0), nLocalServices));
|
||||||
|
|
||||||
|
@ -1812,7 +1820,7 @@ void StartNode(void* parg)
|
||||||
printf("Error: CreateThread(ThreadMessageHandler) failed\n");
|
printf("Error: CreateThread(ThreadMessageHandler) failed\n");
|
||||||
|
|
||||||
// Generate coins in the background
|
// Generate coins in the background
|
||||||
GenerateBitcoins(fGenerateBitcoins, pwalletMain);
|
GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool StopNode()
|
bool StopNode()
|
||||||
|
|
|
@ -152,8 +152,28 @@ int main(int argc, char *argv[])
|
||||||
Q_INIT_RESOURCE(bitcoin);
|
Q_INIT_RESOURCE(bitcoin);
|
||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
|
|
||||||
|
// Command-line options take precedence:
|
||||||
ParseParameters(argc, argv);
|
ParseParameters(argc, argv);
|
||||||
|
|
||||||
|
// ... then bitcoin.conf:
|
||||||
|
if (!ReadConfigFile(mapArgs, mapMultiArgs))
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Error: Specified directory does not exist\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Application identification (must be set before OptionsModel is initialized,
|
||||||
|
// as it is used to locate QSettings)
|
||||||
|
app.setOrganizationName("Bitcoin");
|
||||||
|
app.setOrganizationDomain("bitcoin.org");
|
||||||
|
if(GetBoolArg("-testnet")) // Separate UI settings for testnet
|
||||||
|
app.setApplicationName("Bitcoin-Qt-testnet");
|
||||||
|
else
|
||||||
|
app.setApplicationName("Bitcoin-Qt");
|
||||||
|
|
||||||
|
// ... then GUI settings:
|
||||||
|
OptionsModel optionsModel;
|
||||||
|
|
||||||
// Get desired locale ("en_US") from command line or system locale
|
// Get desired locale ("en_US") from command line or system locale
|
||||||
QString lang_territory = QString::fromStdString(GetArg("-lang", QLocale::system().name().toStdString()));
|
QString lang_territory = QString::fromStdString(GetArg("-lang", QLocale::system().name().toStdString()));
|
||||||
// Load language files for configured locale:
|
// Load language files for configured locale:
|
||||||
|
@ -180,8 +200,6 @@ int main(int argc, char *argv[])
|
||||||
if (!translator.isEmpty())
|
if (!translator.isEmpty())
|
||||||
app.installTranslator(&translator);
|
app.installTranslator(&translator);
|
||||||
|
|
||||||
app.setApplicationName(QApplication::translate("main", "Bitcoin-Qt"));
|
|
||||||
|
|
||||||
QSplashScreen splash(QPixmap(":/images/splash"), 0);
|
QSplashScreen splash(QPixmap(":/images/splash"), 0);
|
||||||
if (GetBoolArg("-splash", true) && !GetBoolArg("-min"))
|
if (GetBoolArg("-splash", true) && !GetBoolArg("-min"))
|
||||||
{
|
{
|
||||||
|
@ -201,10 +219,13 @@ int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
// Put this in a block, so that BitcoinGUI is cleaned up properly before
|
// Put this in a block, so that BitcoinGUI is cleaned up properly before
|
||||||
// calling Shutdown() in case of exceptions.
|
// calling Shutdown() in case of exceptions.
|
||||||
|
|
||||||
|
optionsModel.Upgrade(); // Must be done after AppInit2
|
||||||
|
|
||||||
BitcoinGUI window;
|
BitcoinGUI window;
|
||||||
if (splashref)
|
if (splashref)
|
||||||
splash.finish(&window);
|
splash.finish(&window);
|
||||||
OptionsModel optionsModel(pwalletMain);
|
|
||||||
ClientModel clientModel(&optionsModel);
|
ClientModel clientModel(&optionsModel);
|
||||||
WalletModel walletModel(pwalletMain, &optionsModel);
|
WalletModel walletModel(pwalletMain, &optionsModel);
|
||||||
|
|
||||||
|
|
|
@ -1,21 +1,94 @@
|
||||||
#include "optionsmodel.h"
|
#include "optionsmodel.h"
|
||||||
#include "bitcoinunits.h"
|
#include "bitcoinunits.h"
|
||||||
|
#include <QSettings>
|
||||||
|
|
||||||
#include "headers.h"
|
#include "headers.h"
|
||||||
#include "init.h"
|
#include "init.h"
|
||||||
|
|
||||||
OptionsModel::OptionsModel(CWallet *wallet, QObject *parent) :
|
OptionsModel::OptionsModel(QObject *parent) :
|
||||||
QAbstractListModel(parent),
|
QAbstractListModel(parent)
|
||||||
wallet(wallet),
|
|
||||||
nDisplayUnit(BitcoinUnits::BTC),
|
|
||||||
bDisplayAddresses(false)
|
|
||||||
{
|
{
|
||||||
// Read our specific settings from the wallet db
|
Init();
|
||||||
CWalletDB walletdb(wallet->strWalletFile);
|
|
||||||
walletdb.ReadSetting("nDisplayUnit", nDisplayUnit);
|
|
||||||
walletdb.ReadSetting("bDisplayAddresses", bDisplayAddresses);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OptionsModel::Init()
|
||||||
|
{
|
||||||
|
QSettings settings;
|
||||||
|
|
||||||
|
// 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();
|
||||||
|
|
||||||
|
// 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());
|
||||||
|
}
|
||||||
|
|
||||||
|
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("wallet.dat");
|
||||||
|
|
||||||
|
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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try
|
||||||
|
{
|
||||||
|
CAddress addrProxyAddress;
|
||||||
|
if (walletdb.ReadSetting("addrProxy", addrProxyAddress))
|
||||||
|
{
|
||||||
|
addrProxy = addrProxyAddress;
|
||||||
|
settings.setValue("addrProxy", addrProxy.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
|
||||||
|
if (walletdb.ReadSetting("addrProxy", addrProxy))
|
||||||
|
{
|
||||||
|
settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
|
||||||
|
walletdb.EraseSetting("addrProxy");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Init();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
int OptionsModel::rowCount(const QModelIndex & parent) const
|
int OptionsModel::rowCount(const QModelIndex & parent) const
|
||||||
{
|
{
|
||||||
return OptionIDRowCount;
|
return OptionIDRowCount;
|
||||||
|
@ -25,6 +98,7 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
|
||||||
{
|
{
|
||||||
if(role == Qt::EditRole)
|
if(role == Qt::EditRole)
|
||||||
{
|
{
|
||||||
|
QSettings settings;
|
||||||
switch(index.row())
|
switch(index.row())
|
||||||
{
|
{
|
||||||
case StartAtStartup:
|
case StartAtStartup:
|
||||||
|
@ -32,11 +106,11 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
|
||||||
case MinimizeToTray:
|
case MinimizeToTray:
|
||||||
return QVariant(fMinimizeToTray);
|
return QVariant(fMinimizeToTray);
|
||||||
case MapPortUPnP:
|
case MapPortUPnP:
|
||||||
return QVariant(fUseUPnP);
|
return settings.value("fUseUPnP", GetBoolArg("-upnp", true));
|
||||||
case MinimizeOnClose:
|
case MinimizeOnClose:
|
||||||
return QVariant(fMinimizeOnClose);
|
return QVariant(fMinimizeOnClose);
|
||||||
case ConnectSOCKS4:
|
case ConnectSOCKS4:
|
||||||
return QVariant(fUseProxy);
|
return settings.value("fUseProxy", false);
|
||||||
case ProxyIP:
|
case ProxyIP:
|
||||||
return QVariant(QString::fromStdString(addrProxy.ToStringIP()));
|
return QVariant(QString::fromStdString(addrProxy.ToStringIP()));
|
||||||
case ProxyPort:
|
case ProxyPort:
|
||||||
|
@ -59,7 +133,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
|
||||||
bool successful = true; /* set to false on parse error */
|
bool successful = true; /* set to false on parse error */
|
||||||
if(role == Qt::EditRole)
|
if(role == Qt::EditRole)
|
||||||
{
|
{
|
||||||
CWalletDB walletdb(wallet->strWalletFile);
|
QSettings settings;
|
||||||
switch(index.row())
|
switch(index.row())
|
||||||
{
|
{
|
||||||
case StartAtStartup:
|
case StartAtStartup:
|
||||||
|
@ -67,22 +141,22 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
|
||||||
break;
|
break;
|
||||||
case MinimizeToTray:
|
case MinimizeToTray:
|
||||||
fMinimizeToTray = value.toBool();
|
fMinimizeToTray = value.toBool();
|
||||||
walletdb.WriteSetting("fMinimizeToTray", fMinimizeToTray);
|
settings.setValue("fMinimizeToTray", fMinimizeToTray);
|
||||||
break;
|
break;
|
||||||
case MapPortUPnP:
|
case MapPortUPnP:
|
||||||
fUseUPnP = value.toBool();
|
{
|
||||||
walletdb.WriteSetting("fUseUPnP", fUseUPnP);
|
bool bUseUPnP = value.toBool();
|
||||||
#ifdef USE_UPNP
|
settings.setValue("fUseUPnP", bUseUPnP);
|
||||||
MapPort(fUseUPnP);
|
MapPort(bUseUPnP);
|
||||||
#endif
|
}
|
||||||
break;
|
break;
|
||||||
case MinimizeOnClose:
|
case MinimizeOnClose:
|
||||||
fMinimizeOnClose = value.toBool();
|
fMinimizeOnClose = value.toBool();
|
||||||
walletdb.WriteSetting("fMinimizeOnClose", fMinimizeOnClose);
|
settings.setValue("fMinimizeOnClose", fMinimizeOnClose);
|
||||||
break;
|
break;
|
||||||
case ConnectSOCKS4:
|
case ConnectSOCKS4:
|
||||||
fUseProxy = value.toBool();
|
fUseProxy = value.toBool();
|
||||||
walletdb.WriteSetting("fUseProxy", fUseProxy);
|
settings.setValue("fUseProxy", fUseProxy);
|
||||||
break;
|
break;
|
||||||
case ProxyIP:
|
case ProxyIP:
|
||||||
{
|
{
|
||||||
|
@ -91,7 +165,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
|
||||||
if (addr.IsValid())
|
if (addr.IsValid())
|
||||||
{
|
{
|
||||||
addrProxy.SetIP(addr);
|
addrProxy.SetIP(addr);
|
||||||
walletdb.WriteSetting("addrProxy", addrProxy);
|
settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -105,7 +179,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
|
||||||
if (nPort > 0 && nPort < std::numeric_limits<unsigned short>::max())
|
if (nPort > 0 && nPort < std::numeric_limits<unsigned short>::max())
|
||||||
{
|
{
|
||||||
addrProxy.SetPort(nPort);
|
addrProxy.SetPort(nPort);
|
||||||
walletdb.WriteSetting("addrProxy", addrProxy);
|
settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -115,18 +189,18 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
|
||||||
break;
|
break;
|
||||||
case Fee: {
|
case Fee: {
|
||||||
nTransactionFee = value.toLongLong();
|
nTransactionFee = value.toLongLong();
|
||||||
walletdb.WriteSetting("nTransactionFee", nTransactionFee);
|
settings.setValue("nTransactionFee", nTransactionFee);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case DisplayUnit: {
|
case DisplayUnit: {
|
||||||
int unit = value.toInt();
|
int unit = value.toInt();
|
||||||
nDisplayUnit = unit;
|
nDisplayUnit = unit;
|
||||||
walletdb.WriteSetting("nDisplayUnit", nDisplayUnit);
|
settings.setValue("nDisplayUnit", nDisplayUnit);
|
||||||
emit displayUnitChanged(unit);
|
emit displayUnitChanged(unit);
|
||||||
}
|
}
|
||||||
case DisplayAddresses: {
|
case DisplayAddresses: {
|
||||||
bDisplayAddresses = value.toBool();
|
bDisplayAddresses = value.toBool();
|
||||||
walletdb.WriteSetting("bDisplayAddresses", bDisplayAddresses);
|
settings.setValue("bDisplayAddresses", bDisplayAddresses);
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
|
|
||||||
#include <QAbstractListModel>
|
#include <QAbstractListModel>
|
||||||
|
|
||||||
class CWallet;
|
|
||||||
|
|
||||||
/** Interface from QT to configuration data structure for bitcoin client.
|
/** Interface from QT to configuration data structure for bitcoin client.
|
||||||
To QT, the options are presented as a list with the different options
|
To QT, the options are presented as a list with the different options
|
||||||
laid out vertically.
|
laid out vertically.
|
||||||
|
@ -15,7 +13,7 @@ class OptionsModel : public QAbstractListModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit OptionsModel(CWallet *wallet, QObject *parent = 0);
|
explicit OptionsModel(QObject *parent = 0);
|
||||||
|
|
||||||
enum OptionID {
|
enum OptionID {
|
||||||
StartAtStartup, // bool
|
StartAtStartup, // bool
|
||||||
|
@ -31,6 +29,11 @@ public:
|
||||||
OptionIDRowCount
|
OptionIDRowCount
|
||||||
};
|
};
|
||||||
|
|
||||||
|
void Init();
|
||||||
|
|
||||||
|
/* Migrate settings from wallet.dat after app initialization */
|
||||||
|
bool Upgrade(); /* returns true if settings upgraded */
|
||||||
|
|
||||||
int rowCount(const QModelIndex & parent = QModelIndex()) const;
|
int rowCount(const QModelIndex & parent = QModelIndex()) const;
|
||||||
QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
|
QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
|
||||||
bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole);
|
bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole);
|
||||||
|
@ -42,10 +45,10 @@ public:
|
||||||
int getDisplayUnit();
|
int getDisplayUnit();
|
||||||
bool getDisplayAddresses();
|
bool getDisplayAddresses();
|
||||||
private:
|
private:
|
||||||
// Wallet stores persistent options
|
|
||||||
CWallet *wallet;
|
|
||||||
int nDisplayUnit;
|
int nDisplayUnit;
|
||||||
bool bDisplayAddresses;
|
bool bDisplayAddresses;
|
||||||
|
bool fMinimizeToTray;
|
||||||
|
bool fMinimizeOnClose;
|
||||||
signals:
|
signals:
|
||||||
void displayUnitChanged(int unit);
|
void displayUnitChanged(int unit);
|
||||||
|
|
||||||
|
|
18
src/util.cpp
18
src/util.cpp
|
@ -908,15 +908,28 @@ string GetConfigFile()
|
||||||
return pathConfig.string();
|
return pathConfig.string();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReadConfigFile(map<string, string>& mapSettingsRet,
|
bool ReadConfigFile(map<string, string>& mapSettingsRet,
|
||||||
map<string, vector<string> >& mapMultiSettingsRet)
|
map<string, vector<string> >& mapMultiSettingsRet)
|
||||||
{
|
{
|
||||||
namespace fs = boost::filesystem;
|
namespace fs = boost::filesystem;
|
||||||
namespace pod = boost::program_options::detail;
|
namespace pod = boost::program_options::detail;
|
||||||
|
|
||||||
|
if (mapSettingsRet.count("-datadir"))
|
||||||
|
{
|
||||||
|
if (fs::is_directory(fs::system_complete(mapSettingsRet["-datadir"])))
|
||||||
|
{
|
||||||
|
fs::path pathDataDir = fs::system_complete(mapSettingsRet["-datadir"]);
|
||||||
|
strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fs::ifstream streamConfig(GetConfigFile());
|
fs::ifstream streamConfig(GetConfigFile());
|
||||||
if (!streamConfig.good())
|
if (!streamConfig.good())
|
||||||
return;
|
return true; // No bitcoin.conf file is OK
|
||||||
|
|
||||||
set<string> setOptions;
|
set<string> setOptions;
|
||||||
setOptions.insert("*");
|
setOptions.insert("*");
|
||||||
|
@ -933,6 +946,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
|
||||||
}
|
}
|
||||||
mapMultiSettingsRet[strKey].push_back(it->value[0]);
|
mapMultiSettingsRet[strKey].push_back(it->value[0]);
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
string GetPidFile()
|
string GetPidFile()
|
||||||
|
|
|
@ -151,7 +151,7 @@ void GetDataDir(char* pszDirRet);
|
||||||
std::string GetConfigFile();
|
std::string GetConfigFile();
|
||||||
std::string GetPidFile();
|
std::string GetPidFile();
|
||||||
void CreatePidFile(std::string pidFile, pid_t pid);
|
void CreatePidFile(std::string pidFile, pid_t pid);
|
||||||
void ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet);
|
bool ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet);
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
std::string MyGetSpecialFolderPath(int nFolder, bool fCreate);
|
std::string MyGetSpecialFolderPath(int nFolder, bool fCreate);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue