diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-03-11 08:32:07 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-03-11 08:46:01 +0100 |
| commit | c52c4e5d14fb20a0abc6fdcf8601ae5a0626ddcf (patch) | |
| tree | d88fb17b4d81bc9c91039e49c78b5d8307df17ce /src/qt/intro.cpp | |
| parent | a63f8b7b36e39722024a0ba061ca214f00a8f1bd (diff) | |
qt: Make it possible again to specify -testnet in config file
Changes for the datadir chooser have made it impossible to specify
the network (testnet/regtest) in the configuration file for the GUI.
Reorganize the initialization sequence to make this possible again.
- Moves the "datadir" QSetting so that is no longer dependent on the
network-specific application name (doing otherwise would create a
chicken-and-egg problem).
- Re-initialize translations after choosing network. There may be a
different language configured in network-specific settings
(slim chance, but handle it for sanity).
Fixes point 1 of #3840.
Diffstat (limited to 'src/qt/intro.cpp')
| -rw-r--r-- | src/qt/intro.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 42833a8a33..3bc19f8645 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -146,7 +146,7 @@ QString Intro::getDefaultDataDirectory() return QString::fromStdString(GetDefaultDataDir().string()); } -void Intro::pickDataDirectory(bool fIsTestnet) +void Intro::pickDataDirectory() { namespace fs = boost::filesystem; QSettings settings; @@ -164,10 +164,7 @@ void Intro::pickDataDirectory(bool fIsTestnet) /* If current default data directory does not exist, let the user choose one */ Intro intro; intro.setDataDirectory(dataDir); - if (!fIsTestnet) - intro.setWindowIcon(QIcon(":icons/bitcoin")); - else - intro.setWindowIcon(QIcon(":icons/bitcoin_testnet")); + intro.setWindowIcon(QIcon(":icons/bitcoin")); while(true) { |