From 80fccb0eb3756af5385460d9008b9b8b17b7cda5 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Sun, 19 May 2013 20:20:06 +0200 Subject: Bitcoin-Qt: setup testnet GUI directly - this directly sets up all GUI elements that have testnet special-casing without first setting up main net stuff and changing afterwards (titles, icons etc.) - also fixes 2 wrong icons shown during testnet usage on our toolbar --- src/qt/bitcoin.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/qt/bitcoin.cpp') diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index b858e1c17..9bcac5979 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -15,9 +15,6 @@ #include "ui_interface.h" #include "paymentserver.h" #include "splashscreen.h" -#ifdef Q_OS_MAC -#include "macdockiconhandler.h" -#endif #include #if QT_VERSION < 0x050000 @@ -205,14 +202,6 @@ 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", false)) - { - MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet")); - } -#endif - SplashScreen splash(QPixmap(), 0); if (GetBoolArg("-splash", true) && !GetBoolArg("-min", false)) { @@ -232,7 +221,7 @@ int main(int argc, char *argv[]) boost::thread_group threadGroup; - BitcoinGUI window; + BitcoinGUI window(GetBoolArg("-testnet", false), 0); guiref = &window; QTimer* pollShutdownTimer = new QTimer(guiref); -- cgit v1.2.3