aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-05-03 14:39:22 -0700
committerGavin Andresen <gavinandresen@gmail.com>2013-05-03 14:39:22 -0700
commitdb1dc95f0ad75f621da74339a35e25b04b2e8796 (patch)
tree1976631b7918dcd44bbc0cae48e191972630a78b /src
parent4a4e9a3f8d7581930baf7496d922d28f4574c817 (diff)
parent367491df9d4a4e323a9d20fc118446ddccf08e11 (diff)
Merge pull request #2614 from jonasschnelli/icon_testnet_mac
osx: show testnet icon in dock as early as possible
Diffstat (limited to 'src')
-rw-r--r--src/qt/bitcoin.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 25448ea8cf..1083f9bfe1 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -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"))
{