Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-05 21:04:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed only show a new message icon on tray when its a inbox message

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2478 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-03-03 21:55:07 +00:00
parent 5ed5e8eb92
commit 706e26a7e3
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -222,10 +222,11 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/* Create the toolbar */ /* Create the toolbar */
ui.toolBar->addActions(grp->actions()); ui.toolBar->addActions(grp->actions());
ui.toolBar->addSeparator();
connect(grp, SIGNAL(triggered(QAction *)), ui.stackPages, SLOT(showPage(QAction *))); connect(grp, SIGNAL(triggered(QAction *)), ui.stackPages, SLOT(showPage(QAction *)));
#ifdef UNFINISHED #ifdef UNFINISHED
ui.toolBar->addSeparator();
addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow())); addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
#endif #endif
@ -352,7 +353,7 @@ void MainWindow::updateStatus()
for(it = msgList.begin(); it != msgList.end(); it++) for(it = msgList.begin(); it != msgList.end(); it++)
{ {
if (it -> msgflags & RS_MSG_NEW) if ((it -> msgflags & RS_MSG_BOXMASK) == RS_MSG_INBOX && ((it -> msgflags & RS_MSG_NEW) == RS_MSG_NEW))
{ {
trayIcon->setIcon(QIcon(":/images/newmsg.png")); trayIcon->setIcon(QIcon(":/images/newmsg.png"));
trayIcon->setToolTip(tr("RetroShare") + "\n" + tr("You has a new message")); trayIcon->setToolTip(tr("RetroShare") + "\n" + tr("You has a new message"));