Browse Source

Merge pull request #2931 from Diapolo/intro

Bitcoin-Qt: add testnet check and icon to intro dialog
0.10
Wladimir J. van der Laan 11 years ago
parent
commit
ff33a3470d
  1. 2
      src/qt/bitcoin.cpp
  2. 7
      src/qt/intro.cpp
  3. 2
      src/qt/intro.h

2
src/qt/bitcoin.cpp

@ -232,7 +232,7 @@ int main(int argc, char *argv[]) @@ -232,7 +232,7 @@ int main(int argc, char *argv[])
PaymentServer* paymentServer = new PaymentServer(&app);
// User language is set up: pick a data directory
Intro::pickDataDirectory();
Intro::pickDataDirectory(TestNet());
// Install global event filter that makes sure that long tooltips can be word-wrapped
app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app));

7
src/qt/intro.cpp

@ -142,7 +142,7 @@ QString Intro::getDefaultDataDirectory() @@ -142,7 +142,7 @@ QString Intro::getDefaultDataDirectory()
return QString::fromStdString(GetDefaultDataDir().string());
}
void Intro::pickDataDirectory()
void Intro::pickDataDirectory(bool fIsTestnet)
{
namespace fs = boost::filesystem;;
QSettings settings;
@ -160,6 +160,11 @@ void Intro::pickDataDirectory() @@ -160,6 +160,11 @@ void Intro::pickDataDirectory()
/* 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"));
while(true)
{
if(!intro.exec())

2
src/qt/intro.h

@ -31,7 +31,7 @@ public: @@ -31,7 +31,7 @@ public:
* @note do NOT call global GetDataDir() before calling this function, this
* will cause the wrong path to be cached.
*/
static void pickDataDirectory();
static void pickDataDirectory(bool fIsTestnet);
/**
* Determine default data directory for operating system.

Loading…
Cancel
Save