projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qtui: Use icon names in tray implementations
[quassel.git]
/
src
/
qtui
/
legacysystemtray.h
diff --git
a/src/qtui/legacysystemtray.h
b/src/qtui/legacysystemtray.h
index
1bbef64
..
c4af3df
100644
(file)
--- a/
src/qtui/legacysystemtray.h
+++ b/
src/qtui/legacysystemtray.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This file is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This file is free software; you can redistribute it and/or modify *
@@
-23,13
+23,12
@@
#ifndef QT_NO_SYSTEMTRAYICON
#ifndef QT_NO_SYSTEMTRAYICON
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
# include <KSystemTrayIcon>
#else
# include <QSystemTrayIcon>
#endif
# include <KSystemTrayIcon>
#else
# include <QSystemTrayIcon>
#endif
-#include <QIcon>
#include <QTimer>
#include "systemtray.h"
#include <QTimer>
#include "systemtray.h"
@@
-45,7
+44,6
@@
public:
virtual bool isVisible() const;
virtual inline bool isSystemTrayAvailable() const;
virtual bool isVisible() const;
virtual inline bool isSystemTrayAvailable() const;
- virtual QIcon stateIcon() const; // overriden to care about blinkState
public slots:
virtual void setState(State state);
public slots:
virtual void setState(State state);
@@
-58,6
+56,9
@@
protected slots:
protected:
virtual void setMode(Mode mode);
protected:
virtual void setMode(Mode mode);
+private:
+ void updateIcon();
+
private slots:
void on_blinkTimeout();
void on_activated(QSystemTrayIcon::ActivationReason);
private slots:
void on_blinkTimeout();
void on_activated(QSystemTrayIcon::ActivationReason);
@@
-70,7
+71,7
@@
private:
bool _blinkState;
uint _lastMessageId;
bool _blinkState;
uint _lastMessageId;
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
KSystemTrayIcon *_trayIcon;
#else
QSystemTrayIcon *_trayIcon;
KSystemTrayIcon *_trayIcon;
#else
QSystemTrayIcon *_trayIcon;