projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce feature flag for remote disconnecting
[quassel.git]
/
src
/
qtui
/
statusnotifieritem.cpp
diff --git
a/src/qtui/statusnotifieritem.cpp
b/src/qtui/statusnotifieritem.cpp
index
df04252
..
0a4f36e
100644
(file)
--- a/
src/qtui/statusnotifieritem.cpp
+++ b/
src/qtui/statusnotifieritem.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This contains code from KStatusNotifierItem, part of the KDE libs *
* devel@quassel-irc.org *
* *
* This contains code from KStatusNotifierItem, part of the KDE libs *
@@
-51,15
+51,8
@@
public:
protected:
virtual QString iconNameForAction(QAction *action) // TODO Qt 4.7: fixme when we have converted our iconloader
{
protected:
virtual QString iconNameForAction(QAction *action) // TODO Qt 4.7: fixme when we have converted our iconloader
{
- Icon icon(action->icon());
-#if QT_VERSION >= 0x040701
- // QIcon::name() is in the 4.7 git branch, but it is not in 4.7 TP.
- // If you get a build error here, you need to update your pre-release
- // of Qt 4.7.
+ QIcon icon(action->icon());
return icon.isNull() ? QString() : icon.name();
return icon.isNull() ? QString() : icon.name();
-#else
- return QString();
-#endif
}
};
}
};
@@
-249,7
+242,7
@@
QString StatusNotifierItem::title() const
QString StatusNotifierItem::iconName() const
{
if (state() == Passive)
QString StatusNotifierItem::iconName() const
{
if (state() == Passive)
- return QString("
quassel-inactive
");
+ return QString("
inactive-quassel
");
else
return QString("quassel");
}
else
return QString("quassel");
}
@@
-258,7
+251,7
@@
QString StatusNotifierItem::iconName() const
QString StatusNotifierItem::attentionIconName() const
{
if (animationEnabled())
QString StatusNotifierItem::attentionIconName() const
{
if (animationEnabled())
- return QString("
quassel-message
");
+ return QString("
message-quassel
");
else
return QString("quassel");
}
else
return QString("quassel");
}
@@
-293,7
+286,7
@@
bool StatusNotifierItem::eventFilter(QObject *watched, QEvent *event)
{
if (mode() == StatusNotifier) {
//FIXME: ugly ugly workaround to weird QMenu's focus problems
{
if (mode() == StatusNotifier) {
//FIXME: ugly ugly workaround to weird QMenu's focus problems
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
if (watched == trayMenu() &&
(event->type() == QEvent::WindowDeactivate || (event->type() == QEvent::MouseButtonRelease && static_cast<QMouseEvent *>(event)->button() == Qt::LeftButton))) {
// put at the back of event queue to let the action activate anyways
if (watched == trayMenu() &&
(event->type() == QEvent::WindowDeactivate || (event->type() == QEvent::MouseButtonRelease && static_cast<QMouseEvent *>(event)->button() == Qt::LeftButton))) {
// put at the back of event queue to let the action activate anyways