-
Notifications
You must be signed in to change notification settings - Fork 37.8k
Move options from wallet.dat to QT settings files #890
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Do we want this in 0.6.0 still? |
Hmm, as this has pretty significant changes, I think we should leave this for 0.7.0, and try it out a bit ourselves first. |
If (a rebased version of) this isn't pulled for 0.6 then another fix for #815 (UpNP settings don't stick) is needed-- trying to fix that bug is what led me to pull my hair out and decide the whole settings system needed to be overhauled. |
ok, in that case it's fine with me to add it for 0.6.0 already |
case MinimizeOnClose: | ||
return QVariant(fMinimizeOnClose); | ||
case ConnectSOCKS4: | ||
return QVariant(fUseProxy); | ||
return settings.value("fUseProxy", false); | ||
case ProxyIP: | ||
return QVariant(QString::fromStdString(addrProxy.ToStringIP())); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be ToStringIPPort(), I think.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't that append the port? It only wants the IP here, port is separate.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, yes it would. Still, the proxy port doesn't seem to get saved to the file?
Included in #904 |
3d382cb Add `getblockheaders` RPC
Fix OSX use of CLOCK_MONOTONIC and move win gitian build to main repo
b5a5257 [Refactor] Remove unused setStakeSeen variable (warrows) Tree-SHA512: c5244b3cf269d3b6171a5b241265b98bffcfbf580cecbf9cc2741ea2b3374deb558459a8764f1931080331b11456a8d129dbcc3b6e59955f15bc184333e23ca8
The main motivation for this was a lot of frustration because command-line, bitcoin.conf, and wallet.dat settings were interacting in ill-defined ways.
Now GUI settings are stored in QT settings files; see
http://developer.qt.nokia.com/doc/qt-4.8/qsettings.html#platform-specific-notes
... for details on where. Testnet and main network have their own separate files (thanks @laanwj).
The first time you run with this patch settings from your wallet.dat will be read and moved over to the new settings file (and the settings erased from wallet.dat). From then on, settings in the wallet.dat are ignored-- so if you're using --datadir and multiple wallets, don't expect the setting to be read/erased from the other wallets.
The 'proxy' setting is behaving badly (e.g. 127.0.0.1 is turned into an IP6-looking address), but I'm 90% sure that is a pre-existing bug based on other reports of weird strings in the proxy setting with the 0.6 release. I'll file an issue about that.