changeset 2485:c98c94ebc96f draft

Merge pull request #1259 from Diapolo/GUI_testnet_UX GUI: allow easier use of the testnet icon
author Wladimir J. van der Laan <laanwj@gmail.com>
date Fri, 11 May 2012 06:35:50 -0700
parents 4cc81040de04 (current diff) 2ccc3ae72973 (diff)
children 44413fcca3b4
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -71,6 +71,7 @@
     resize(850, 550);
     setWindowTitle(tr("Bitcoin Wallet"));
 #ifndef Q_WS_MAC
+    qApp->setWindowIcon(QIcon(":icons/bitcoin"));
     setWindowIcon(QIcon(":icons/bitcoin"));
 #else
     setUnifiedTitleAndToolBarOnMac(true);
@@ -326,6 +327,7 @@
         {
             setWindowTitle(windowTitle() + QString(" ") + tr("[testnet]"));
 #ifndef Q_WS_MAC
+            qApp->setWindowIcon(QIcon(":icons/bitcoin_testnet"));
             setWindowIcon(QIcon(":icons/bitcoin_testnet"));
 #else
             MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet"));