Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-21 21:55:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename menu to trayMenu

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-01-01 13:45:35 +00:00
parent 5fb8107779
commit 2a107ad706
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -285,31 +285,31 @@ MainWindow::~MainWindow()
void MainWindow::createTrayIcon() void MainWindow::createTrayIcon()
{ {
/** Tray icon Menu **/ /** Tray icon Menu **/
menu = new QMenu(this); trayMenu = new QMenu(this);
QObject::connect(menu, SIGNAL(aboutToShow()), this, SLOT(updateMenu())); QObject::connect(trayMenu, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));
toggleVisibilityAction = toggleVisibilityAction =
menu->addAction(QIcon(IMAGE_RETROSHARE), tr("Show/Hide"), this, SLOT(toggleVisibilitycontextmenu())); trayMenu->addAction(QIcon(IMAGE_RETROSHARE), tr("Show/Hide"), this, SLOT(toggleVisibilitycontextmenu()));
menu->addSeparator(); trayMenu->addSeparator();
menu->addAction(_messengerwindowAct); trayMenu->addAction(_messengerwindowAct);
menu->addAction(_messagesAct); trayMenu->addAction(_messagesAct);
menu->addAction(_bandwidthAct); trayMenu->addAction(_bandwidthAct);
#ifdef UNFINISHED #ifdef UNFINISHED
menu->addAction(_appAct); trayMenu->addAction(_appAct);
#endif #endif
menu->addAction(_settingsAct); trayMenu->addAction(_settingsAct);
menu->addAction(_helpAct); trayMenu->addAction(_helpAct);
menu->addSeparator(); trayMenu->addSeparator();
menu->addAction(QIcon(IMAGE_MINIMIZE), tr("Minimize"), this, SLOT(showMinimized())); trayMenu->addAction(QIcon(IMAGE_MINIMIZE), tr("Minimize"), this, SLOT(showMinimized()));
menu->addAction(QIcon(IMAGE_MAXIMIZE), tr("Maximize"), this, SLOT(showMaximized())); trayMenu->addAction(QIcon(IMAGE_MAXIMIZE), tr("Maximize"), this, SLOT(showMaximized()));
menu->addSeparator(); trayMenu->addSeparator();
menu->addAction(QIcon(IMAGE_CLOSE), tr("&Quit"), this, SLOT(doQuit())); trayMenu->addAction(QIcon(IMAGE_CLOSE), tr("&Quit"), this, SLOT(doQuit()));
/** End of Icon Menu **/ /** End of Icon Menu **/
// Create the tray icon // Create the tray icon
trayIcon = new QSystemTrayIcon(this); trayIcon = new QSystemTrayIcon(this);
trayIcon->setToolTip(tr("RetroShare")); trayIcon->setToolTip(tr("RetroShare"));
trayIcon->setContextMenu(menu); trayIcon->setContextMenu(trayMenu);
trayIcon->setIcon(QIcon(IMAGE_NOONLINE)); trayIcon->setIcon(QIcon(IMAGE_NOONLINE));
connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this,
@ -319,7 +319,7 @@ void MainWindow::createTrayIcon()
void MainWindow::displaySystrayMsg(const QString& title,const QString& msg) void MainWindow::displaySystrayMsg(const QString& title,const QString& msg)
{ {
trayIcon->showMessage(title, msg, QSystemTrayIcon::Information, 3000); trayIcon->showMessage(title, msg, QSystemTrayIcon::Information, 3000);
} }
void MainWindow::updateStatus() void MainWindow::updateStatus()

2
retroshare-gui/src/gui/MainWindow.h
View File

@ -176,7 +176,7 @@ private:
QSystemTrayIcon *trayIcon; QSystemTrayIcon *trayIcon;
QAction *toggleVisibilityAction, *toolAct; QAction *toggleVisibilityAction, *toolAct;
QMenu *menu; QMenu *trayMenu;
PeerStatus *peerstatus; PeerStatus *peerstatus;
NATStatus *natstatus; NATStatus *natstatus;