#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
#include "settingspages/networkssettingspage.h"
-
+#include "settingspages/notificationssettingspage.h"
#include "debugconsole.h"
#include "global.h"
#include "qtuistyle.h"
-#include <Qt/QtDBus>
-
-
MainWin::MainWin(QtUi *_gui, QWidget *parent)
: QMainWindow(parent),
gui(_gui),
installEventFilter(new JumpKeyHandler(this));
+ UiSettings uiSettings;
+ QString style = uiSettings.value("Style", QString("")).toString();
+ if(style != "") {
+ QApplication::setStyle(style);
+ }
+
+#ifdef HAVE_DBUS
+ desktopNotifications = new org::freedesktop::Notifications(
+ "org.freedesktop.Notifications",
+ "/org/freedesktop/Notifications",
+ QDBusConnection::sessionBus(), this);
+ notificationId = 0;
+ connect(desktopNotifications, SIGNAL(NotificationClosed(uint, uint)), this, SLOT(desktopNotificationClosed(uint, uint)));
+ connect(desktopNotifications, SIGNAL(ActionInvoked(uint, const QString&)), this, SLOT(desktopNotificationInvoked(uint, const QString&)));
+#endif
}
void MainWin::init() {
settingsDlg->registerSettingsPage(new GeneralSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new HighlightSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new AliasesSettingsPage(settingsDlg));
+ settingsDlg->registerSettingsPage(new NotificationsSettingsPage(settingsDlg));
//Category: General
settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
UiSettings uiSettings;
#ifndef SPUTDEV
- if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) {
+ bool displayBubble = uiSettings.value("NotificationBubble", QVariant(true)).toBool();
+ bool displayDesktop = uiSettings.value("NotificationDesktop", QVariant(true)).toBool();
+ if(displayBubble || displayDesktop) {
// FIXME don't invoke style engine for this!
QString text = QtUi::style()->styleString(Message::mircToInternal(msg.contents())).plainText;
- displayTrayIconMessage(title, text);
- sendDesktopNotification(title, text);
+ if(displayBubble) displayTrayIconMessage(title, text);
+# ifdef HAVE_DBUS
+ if(displayDesktop) sendDesktopNotification(title, text);
+# endif
}
#endif
if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
return QMainWindow::event(event);
}
+#ifdef HAVE_DBUS
/*
Using the notification-daemon from Freedesktop's Galago project
http://www.galago-project.org/specs/notification/0.9/x408.html#command-notify
*/
-void MainWin::sendDesktopNotification(const QString &title, const QString &message)
-{
- QStringList actions;
- QMap<QString, QVariant> hints;
- QDBusMessage msg = QDBusMessage::createMethodCall("org.freedesktop.Notifications", "/org/freedesktop/Notifications", "", "Notify");
+void MainWin::sendDesktopNotification(const QString &title, const QString &message) {
+ QStringList actions;
+ QMap<QString, QVariant> hints;
+ UiSettings uiSettings;
+
+ hints["x"] = uiSettings.value("NotificationDesktopHintX", QVariant(0)).toInt(); // Standard hint: x location for the popup to show up
+ hints["y"] = uiSettings.value("NotificationDesktopHintY", QVariant(0)).toInt(); // Standard hint: y location for the popup to show up
+
+ actions << "click" << "Click Me!";
+
+ QDBusReply<uint> reply = desktopNotifications->Notify(
+ "Quassel", // Application name
+ notificationId, // ID of previous notification to replace
+ "", // Icon to display
+ title, // Summary / Header of the message to display
+ QString("%1: %2:\n%3").arg(QTime::currentTime().toString()).arg(title).arg(message), // Body of the message to display
+ actions, // Actions from which the user may choose
+ hints, // Hints to the server displaying the message
+ uiSettings.value("NotificationDesktopTimeout", QVariant(5000)).toInt() // Timeout in milliseconds
+ );
+
+ if(!reply.isValid()) {
+ /* ERROR */
+ qDebug() << "Error on sending notification..." << reply;
+ return;
+ }
+
+ notificationId = reply.value();
- hints["x"] = 100; // Standard hint: x location for the popup to show up
- hints["y"] = 100; // Standard hint: y location for the popup to show up
+ qDebug() << "ID: " << notificationId << " Time: " << QTime::currentTime().toString();
+}
- msg << "Quassel"; // Application name
- msg << quint32(0); // ID of previous notification to replace
- msg << ""; // Icon to display
- msg << "Quassel: " + title; // Summary / Header of the message to display
- msg << message; // Body of the message to display
- msg << actions; // Actions from which the user may choose
- msg << hints; // Hints to the server displaying the message
- msg << qint32(10000); // Timeout in milliseconds
- (void)QDBusConnection::sessionBus().call(msg); // Would return a message containing the id of this notification
+void MainWin::desktopNotificationClosed(uint id, uint reason) {
+ qDebug() << "OID: " << notificationId << " ID: " << id << " Reason: " << reason << " Time: " << QTime::currentTime().toString();
+ notificationId = 0;
}
+void MainWin::desktopNotificationInvoked(uint id, const QString & action) {
+ qDebug() << "OID: " << notificationId << " ID: " << id << " Action: " << action << " Time: " << QTime::currentTime().toString();
+}
+
+#else /* HAVE_DBUS */
+
+void MainWin::desktopNotificationClosed(uint, uint) {}
+void MainWin::desktopNotificationInvoked(uint, const QString &) {}
+
+#endif /* HAVE_DBUS */
+
void MainWin::displayTrayIconMessage(const QString &title, const QString &message) {
systray->showMessage(title, message);
}