Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-23 22:04:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added blinking of the systray icon for the notifier and enabled it for private chat.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-10-24 13:24:38 +00:00
parent a6cb81fd43
commit 179618edbf
3 changed files with 40 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
retroshare-gui/src/gui/chat/ChatUserNotify.h
View file

@ -43,6 +43,7 @@ private:
virtual QIcon getIcon(); virtual QIcon getIcon();
virtual QIcon getMainIcon(bool hasNew); virtual QIcon getMainIcon(bool hasNew);
virtual unsigned int getNewCount(); virtual unsigned int getNewCount();
virtual bool isBlinking() { return true; }
virtual void iconClicked(); virtual void iconClicked();
}; };

34
retroshare-gui/src/gui/common/UserNotify.cpp
View file

@ -22,6 +22,7 @@
#include <QMenu> #include <QMenu>
#include <QToolBar> #include <QToolBar>
#include <QToolButton> #include <QToolButton>
#include <QTimer>
#include "UserNotify.h" #include "UserNotify.h"
@ -33,6 +34,12 @@ UserNotify::UserNotify(QObject *parent) :
mTrayIcon = NULL; mTrayIcon = NULL;
mNotifyIcon = NULL; mNotifyIcon = NULL;
mNewCount = 0; mNewCount = 0;
mLastBlinking = false;
mTimer = new QTimer(this);
mTimer->setInterval(500);
connect(mTimer, SIGNAL(timeout()), this, SLOT(timer()));
} }
void UserNotify::initialize(QToolBar *mainToolBar, QAction *mainAction) void UserNotify::initialize(QToolBar *mainToolBar, QAction *mainAction)
@ -102,7 +109,11 @@ void UserNotify::updateIcon()
if (count) { if (count) {
mTrayIcon->setToolTip("RetroShare\n" + getTrayMessage(count > 1).arg(count)); mTrayIcon->setToolTip("RetroShare\n" + getTrayMessage(count > 1).arg(count));
mTrayIcon->show(); mTrayIcon->show();
if (!mTimer->isActive()) {
mTimer->start();
}
} else { } else {
mTimer->stop();
mTrayIcon->hide(); mTrayIcon->hide();
} }
} }
@ -140,3 +151,26 @@ void UserNotify::trayIconClicked(QSystemTrayIcon::ActivationReason e)
iconClicked(); iconClicked();
} }
} }
void UserNotify::timer()
{
bool blinking = isBlinking();
if (mTrayIcon) {
if (blinking) {
/* blink icon */
if (mTrayIcon->icon().isNull()) {
mTrayIcon->setIcon(getIcon());
} else {
mTrayIcon->setIcon(QIcon());
}
} else {
if (mLastBlinking) {
/* reset icon */
mTrayIcon->setIcon(getIcon());
}
}
}
mLastBlinking = blinking;
}

5
retroshare-gui/src/gui/common/UserNotify.h
View file

@ -28,6 +28,7 @@
class QToolBar; class QToolBar;
class QToolButton; class QToolButton;
class QAction; class QAction;
class QTimer;
class UserNotify : public QObject class UserNotify : public QObject
{ {
@ -52,11 +53,13 @@ public slots:
private slots: private slots:
void trayIconClicked(QSystemTrayIcon::ActivationReason e = QSystemTrayIcon::Trigger); void trayIconClicked(QSystemTrayIcon::ActivationReason e = QSystemTrayIcon::Trigger);
void timer();
private: private:
virtual QIcon getIcon() { return QIcon(); } virtual QIcon getIcon() { return QIcon(); }
virtual QIcon getMainIcon(bool /*hasNew*/) { return QIcon(); } virtual QIcon getMainIcon(bool /*hasNew*/) { return QIcon(); }
virtual unsigned int getNewCount() { return 0; } virtual unsigned int getNewCount() { return 0; }
virtual bool isBlinking() { return false; }
virtual QString getTrayMessage(bool plural); virtual QString getTrayMessage(bool plural);
virtual QString getNotifyMessage(bool plural); virtual QString getNotifyMessage(bool plural);
@ -69,6 +72,8 @@ private:
QAction *mNotifyIcon; QAction *mNotifyIcon;
unsigned int mNewCount; unsigned int mNewCount;
QString mButtonText; QString mButtonText;
QTimer *mTimer;
bool mLastBlinking;
}; };
#endif // USERNOTIFY_H #endif // USERNOTIFY_H