Show testnet icon for tray-menu option Show/Hide / set tooltip for tray icon to match non-testnet text (just [testnet] added) / remove obsolete title_testnet variable'

Philip Kaufmann · Philip Kaufmann · commit 2abbe5fc88f3 · 2012-05-09T15:12:31.000+02:00
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -324,17 +324,17 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
     {
         if(clientModel->isTestNet())
         {
-            QString title_testnet = windowTitle() + QString(" ") + tr("[testnet]");
-            setWindowTitle(title_testnet);
+            setWindowTitle(windowTitle() + QString(" ") + tr("[testnet]"));
 #ifndef Q_WS_MAC
             setWindowIcon(QIcon(":icons/bitcoin_testnet"));
 #else
             MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet"));
 #endif
             if(trayIcon)
             {
-                trayIcon->setToolTip(title_testnet);
+                trayIcon->setToolTip(tr("Bitcoin client") + QString(" ") + tr("[testnet]"));
                 trayIcon->setIcon(QIcon(":/icons/toolbar_testnet"));
+                toggleHideAction->setIcon(QIcon(":/icons/toolbar_testnet"));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -324,17 +324,17 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)`
`324`	`324`	`{`
`325`	`325`	`if(clientModel->isTestNet())`
`326`	`326`	`{`
`327`		`- QString title_testnet = windowTitle() + QString(" ") + tr("[testnet]");`
`328`		`- setWindowTitle(title_testnet);`
	`327`	`+ setWindowTitle(windowTitle() + QString(" ") + tr("[testnet]"));`
`329`	`328`	`#ifndef Q_WS_MAC`
`330`	`329`	`setWindowIcon(QIcon(":icons/bitcoin_testnet"));`
`331`	`330`	`#else`
`332`	`331`	`MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet"));`
`333`	`332`	`#endif`
`334`	`333`	`if(trayIcon)`
`335`	`334`	`{`
`336`		`- trayIcon->setToolTip(title_testnet);`
	`335`	`+ trayIcon->setToolTip(tr("Bitcoin client") + QString(" ") + tr("[testnet]"));`
`337`	`336`	`trayIcon->setIcon(QIcon(":/icons/toolbar_testnet"));`
	`337`	`+ toggleHideAction->setIcon(QIcon(":/icons/toolbar_testnet"));`
`338`	`338`	`}`
`339`	`339`	`}`
`340`	`340`