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

- Moved settings for user notify into the base class

Browse source 
- Removed defines TRAYNOTIFY_...

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-07-24 20:01:12 +00:00
parent d355e8dd88
commit 6792348402
19 changed files with 79 additions and 387 deletions
Download patch file Download diff file Expand all files Collapse all files

48
retroshare-gui/src/gui/chat/ChatUserNotify.cpp
View file

@ -20,7 +20,6 @@
****************************************************************/
#include "ChatUserNotify.h"
#include "gui/settings/rsharesettings.h"
#include "gui/notifyqt.h"
#include "gui/MainWindow.h"
#include "gui/chat/ChatDialog.h"
@ -34,55 +33,14 @@ ChatUserNotify::ChatUserNotify(QObject *parent) :
connect(NotifyQt::getInstance(), SIGNAL(privateChatChanged(int, int)), this, SLOT(privateChatChanged(int, int)));
}
bool ChatUserNotify::hasSetting(QString &name)
bool ChatUserNotify::hasSetting(QString *name, QString *group)
{
name = tr("Private Chat");
if (name) *name = tr("Private Chat");
if (group) *group = "PrivateChat";
return true;
}
bool ChatUserNotify::notifyEnabled()
{
return (Settings->getTrayNotifyFlags() & TRAYNOTIFY_PRIVATECHAT);
}
bool ChatUserNotify::notifyCombined()
{
return (Settings->getTrayNotifyFlags() & TRAYNOTIFY_PRIVATECHAT_COMBINED);
}
bool ChatUserNotify::notifyBlink()
{
return (Settings->getTrayNotifyBlinkFlags() & TRAYNOTIFY_BLINK_PRIVATECHAT);
}
void ChatUserNotify::setNotifyEnabled(bool enabled, bool combined, bool blink)
{
uint notifyFlags = Settings->getTrayNotifyFlags();
uint blinkFlags = Settings->getTrayNotifyBlinkFlags();
if (enabled) {
notifyFlags |= TRAYNOTIFY_PRIVATECHAT;
} else {
notifyFlags &= ~TRAYNOTIFY_PRIVATECHAT;
}
if (combined) {
notifyFlags |= TRAYNOTIFY_PRIVATECHAT_COMBINED;
} else {
notifyFlags &= ~TRAYNOTIFY_PRIVATECHAT_COMBINED;
}
if (blink) {
blinkFlags |= TRAYNOTIFY_BLINK_PRIVATECHAT;
} else {
blinkFlags &= ~TRAYNOTIFY_BLINK_PRIVATECHAT;
}
Settings->setTrayNotifyFlags(notifyFlags);
Settings->setTrayNotifyBlinkFlags(blinkFlags);
}
QIcon ChatUserNotify::getIcon()
{
return QIcon(":/images/chat.png");