aboutsummaryrefslogtreecommitdiff
path: root/src/qt/bitcoingui.cpp
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-07-22 23:15:38 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-07-22 23:15:38 +0000
commitff4be740b56a733beb5c7978b56c6602fae51a2e (patch)
tree2ad1b7b202c6c44c17f499b8cf8c4aa174e62d60 /src/qt/bitcoingui.cpp
parent222ac2b12ab42d7a0ea66cd6fe4e25efa3c31333 (diff)
parent4f620dd0f0d0cd9ae1e2bb0403e07bd303e5b3ba (diff)
downloadbitcoin-ff4be740b56a733beb5c7978b56c6602fae51a2e.tar.xz
Merge branch '0.5.x' into 0.6.0.x
Diffstat (limited to 'src/qt/bitcoingui.cpp')
-rw-r--r--src/qt/bitcoingui.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 4918dddb92..c9d9d1907d 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -313,6 +313,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
this->clientModel = clientModel;
if(clientModel)
{
+ // Replace some strings and icons, when using the testnet
if(clientModel->isTestNet())
{
QString title_testnet = windowTitle() + QString(" ") + tr("[testnet]");
@@ -327,6 +328,8 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
trayIcon->setToolTip(title_testnet);
trayIcon->setIcon(QIcon(":/icons/toolbar_testnet"));
}
+
+ aboutAction->setIcon(QIcon(":/icons/toolbar_testnet"));
}
// Keep up to date with client