projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
icons: Warn on missing icons
[quassel.git]
/
src
/
qtui
/
knotificationbackend.cpp
diff --git
a/src/qtui/knotificationbackend.cpp
b/src/qtui/knotificationbackend.cpp
index
1dd9553
..
e7ba2d4
100644
(file)
--- a/
src/qtui/knotificationbackend.cpp
+++ b/
src/qtui/knotificationbackend.cpp
@@
-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 program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-18,16
+18,21
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include
<KNotification>
-#include <KNotifyConfigWidget>
+#include
"knotificationbackend.h"
+
#include <QTextDocument>
#include <QVBoxLayout>
#include <QTextDocument>
#include <QVBoxLayout>
-#include "knotificationbackend.h"
+#ifdef HAVE_KDE4
+# include <KNotification>
+# include <KNotifyConfigWidget>
+#else
+# include <KNotifications/KNotification>
+# include <KNotifyConfig/KNotifyConfigWidget>
+#endif
#include "client.h"
#include "icon.h"
#include "client.h"
#include "icon.h"
-#include "iconloader.h"
#include "mainwin.h"
#include "networkmodel.h"
#include "qtui.h"
#include "mainwin.h"
#include "networkmodel.h"
#include "qtui.h"
@@
-61,7
+66,7
@@
void KNotificationBackend::notify(const Notification &n)
#else
QString message = QString("<b><%1></b> %2").arg(n.sender, n.message.toHtmlEscaped());
#endif
#else
QString message = QString("<b><%1></b> %2").arg(n.sender, n.message.toHtmlEscaped());
#endif
- KNotification *notification = KNotification::event(type, message,
QIcon::fromTheme
("dialog-information").pixmap(48), QtUi::mainWindow(),
+ KNotification *notification = KNotification::event(type, message,
icon::get
("dialog-information").pixmap(48), QtUi::mainWindow(),
KNotification::RaiseWidgetOnActivation
|KNotification::CloseWhenWidgetActivated
|KNotification::CloseOnTimeout);
KNotification::RaiseWidgetOnActivation
|KNotification::CloseWhenWidgetActivated
|KNotification::CloseOnTimeout);
@@
-72,7
+77,6
@@
void KNotificationBackend::notify(const Notification &n)
_notifications.append(qMakePair(n.notificationId, QPointer<KNotification>(notification)));
updateToolTip();
_notifications.append(qMakePair(n.notificationId, QPointer<KNotification>(notification)));
updateToolTip();
- QtUi::mainWindow()->systemTray()->setAlert(true);
}
}
@@
-96,7
+100,6
@@
void KNotificationBackend::close(uint notificationId)
{
removeNotificationById(notificationId);
//if(!_notifications.count()) // FIXME make configurable
{
removeNotificationById(notificationId);
//if(!_notifications.count()) // FIXME make configurable
- QtUi::mainWindow()->systemTray()->setAlert(false);
}
}