mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-04 23:25:32 -04:00
Added new settings on the NotifyPage to enable or disable the systray icons for messages and posts.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3647 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
51cc1d2b3b
commit
928e236103
7 changed files with 857 additions and 780 deletions
|
@ -446,7 +446,7 @@ void MainWindow::updateMessages()
|
|||
messageAction->setIcon(QIcon(QPixmap(":/images/evolution.png"))) ;
|
||||
}
|
||||
|
||||
if (newInboxCount) {
|
||||
if (newInboxCount && (Settings->getTrayNotifyFlags() & TRAYNOTIFY_MESSAGES)) {
|
||||
if (newInboxCount > 1) {
|
||||
trayIconMessages->setToolTip(tr("RetroShare") + "\n" + tr("You have %1 new messages").arg(newInboxCount));
|
||||
} else {
|
||||
|
@ -470,7 +470,7 @@ void MainWindow::updateForums()
|
|||
forumAction->setIcon(QIcon(IMAGE_FORUMS)) ;
|
||||
}
|
||||
|
||||
if (newMessageCount) {
|
||||
if (newMessageCount && (Settings->getTrayNotifyFlags() & TRAYNOTIFY_FORUMS)) {
|
||||
if (newMessageCount > 1) {
|
||||
trayIconForums->setToolTip(tr("RetroShare") + "\n" + tr("You have %1 new messages").arg(newMessageCount));
|
||||
} else {
|
||||
|
@ -494,7 +494,7 @@ void MainWindow::updateChannels(int type)
|
|||
channelAction->setIcon(QIcon(IMAGE_CHANNELS)) ;
|
||||
}
|
||||
|
||||
if (newMessageCount) {
|
||||
if (newMessageCount && (Settings->getTrayNotifyFlags() & TRAYNOTIFY_CHANNELS)) {
|
||||
if (newMessageCount > 1) {
|
||||
trayIconChannels->setToolTip(tr("RetroShare") + "\n" + tr("You have %1 new messages").arg(newMessageCount));
|
||||
} else {
|
||||
|
@ -552,7 +552,7 @@ void MainWindow::privateChatChanged(int list, int type)
|
|||
/* than count the chat messages */
|
||||
int chatCount = rsMsgs->getPrivateChatQueueCount(true);
|
||||
|
||||
if (chatCount) {
|
||||
if (chatCount && (Settings->getTrayNotifyFlags() & TRAYNOTIFY_PRIVATECHAT)) {
|
||||
trayIconChat->show();
|
||||
} else {
|
||||
trayIconChat->hide();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue