From 706e26a7e3c7f1d35d9313873aa44934db966651 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 3 Mar 2010 21:55:07 +0000 Subject: [PATCH] fixed only show a new message icon on tray when its a inbox message git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2478 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MainWindow.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 1ad0a74fe..9e5aaa989 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -222,10 +222,11 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) /* Create the toolbar */ ui.toolBar->addActions(grp->actions()); - ui.toolBar->addSeparator(); + 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())); #endif @@ -352,7 +353,7 @@ void MainWindow::updateStatus() 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->setToolTip(tr("RetroShare") + "\n" + tr("You has a new message"));