Merge pull request #1259 from Diapolo/GUI_testnet_UX

GUI: allow easier use of the testnet icon
This commit is contained in:
Wladimir J. van der Laan 2012-05-11 06:35:50 -07:00
commit 23f59e7023

View File

@ -71,6 +71,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
resize(850, 550); resize(850, 550);
setWindowTitle(tr("Bitcoin Wallet")); setWindowTitle(tr("Bitcoin Wallet"));
#ifndef Q_WS_MAC #ifndef Q_WS_MAC
qApp->setWindowIcon(QIcon(":icons/bitcoin"));
setWindowIcon(QIcon(":icons/bitcoin")); setWindowIcon(QIcon(":icons/bitcoin"));
#else #else
setUnifiedTitleAndToolBarOnMac(true); setUnifiedTitleAndToolBarOnMac(true);
@ -326,6 +327,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
{ {
setWindowTitle(windowTitle() + QString(" ") + tr("[testnet]")); setWindowTitle(windowTitle() + QString(" ") + tr("[testnet]"));
#ifndef Q_WS_MAC #ifndef Q_WS_MAC
qApp->setWindowIcon(QIcon(":icons/bitcoin_testnet"));
setWindowIcon(QIcon(":icons/bitcoin_testnet")); setWindowIcon(QIcon(":icons/bitcoin_testnet"));
#else #else
MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet")); MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet"));