Merge pull request #2614 from jonasschnelli/icon_testnet_mac

osx: show testnet icon in dock as early as possible
This commit is contained in:
Gavin Andresen 2013-05-03 14:39:22 -07:00
commit db1dc95f0a
1 changed files with 11 additions and 0 deletions

View File

@ -23,6 +23,10 @@
#include <QTranslator>
#include <QLibraryInfo>
#ifdef Q_OS_MAC
#include "macdockiconhandler.h"
#endif
#if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED)
#define _BITCOIN_QT_PLUGINS_INCLUDED
#define __INSURE__
@ -198,6 +202,13 @@ int main(int argc, char *argv[])
return 1;
}
#ifdef Q_OS_MAC
// on mac, also change the icon now because it would look strange to have a testnet splash (green) and a std app icon (orange)
if(GetBoolArg("-testnet")) {
MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet"));
}
#endif
SplashScreen splash(QPixmap(), 0);
if (GetBoolArg("-splash", true) && !GetBoolArg("-min"))
{