diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:18:27 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:18:27 +0000 |
| commit | 23cdae18f08f9435b33718ba2fb00c66dc130b80 (patch) | |
| tree | ac70ac92d19b95acb41217feef2f468cd9f1aaad /src/qt/bitcoingui.cpp | |
| parent | 339eb29a87486d82c2e74dac581be16642af9a99 (diff) | |
| parent | ff4be740b56a733beb5c7978b56c6602fae51a2e (diff) | |
| download | bitcoin-23cdae18f08f9435b33718ba2fb00c66dc130b80.tar.xz | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/init.cpp
src/util.cpp
Diffstat (limited to 'src/qt/bitcoingui.cpp')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index fd31d3c5fe..a917bc3b69 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -311,6 +311,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]"); @@ -325,6 +326,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 |