Merge pull request #1459 from laanwj/2012_06_trayiconmenu

Reorganize tray icon menu into more logical order
This commit is contained in:
Wladimir J. van der Laan 2012-06-14 05:52:33 -07:00
commit d59bce21e5

View File

@ -409,17 +409,17 @@ void BitcoinGUI::createTrayIcon()
// Configuration of the tray icon (or dock icon) icon menu // Configuration of the tray icon (or dock icon) icon menu
trayIconMenu->addAction(toggleHideAction); trayIconMenu->addAction(toggleHideAction);
trayIconMenu->addAction(openRPCConsoleAction);
trayIconMenu->addSeparator(); trayIconMenu->addSeparator();
trayIconMenu->addAction(messageAction); trayIconMenu->addAction(sendCoinsAction);
trayIconMenu->addAction(verifyMessageAction); trayIconMenu->addAction(receiveCoinsAction);
#ifndef FIRST_CLASS_MESSAGING #ifndef FIRST_CLASS_MESSAGING
trayIconMenu->addSeparator(); trayIconMenu->addSeparator();
#endif #endif
trayIconMenu->addAction(sendCoinsAction); trayIconMenu->addAction(messageAction);
trayIconMenu->addAction(receiveCoinsAction); trayIconMenu->addAction(verifyMessageAction);
trayIconMenu->addSeparator(); trayIconMenu->addSeparator();
trayIconMenu->addAction(optionsAction); trayIconMenu->addAction(optionsAction);
trayIconMenu->addAction(openRPCConsoleAction);
#ifndef Q_WS_MAC // This is built-in on Mac #ifndef Q_WS_MAC // This is built-in on Mac
trayIconMenu->addSeparator(); trayIconMenu->addSeparator();
trayIconMenu->addAction(quitAction); trayIconMenu->addAction(quitAction);