Move DBus- and other notification-related settings to their own SettingsPage

[quassel.git] / src / qtui / mainwin.cpp

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index d874a21..7efe5f2 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -59,7 +59,7 @@
 #include "settingspages/highlightsettingspage.h"
 #include "settingspages/identitiessettingspage.h"
 #include "settingspages/networkssettingspage.h"
-
+#include "settingspages/notificationssettingspage.h"
 
 #include "debugconsole.h"
 #include "global.h"
@@ -249,6 +249,7 @@ void MainWin::setupSettingsDlg() {
   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));
@@ -659,31 +660,33 @@ void MainWin::sendDesktopNotification(const QString &title, const QString &messa
                 uiSettings.value("NotificationDesktopTimeout", QVariant(5000)).toInt() // Timeout in milliseconds
         );
 
-        if (!reply.isValid())
-        {
-                /* ERROR */
-                qDebug() << "Error on sending notification...";
-                return;
-        }
+  if(!reply.isValid()) {
+    /* ERROR */
+    qDebug() << "Error on sending notification..." << reply;
+    return;
+  }
 
-        notificationId = reply.value();
+  notificationId = reply.value();
 
-        qDebug() << "ID: " << notificationId << " Time: " << QTime::currentTime().toString();
+  qDebug() << "ID: " << notificationId << " Time: " << QTime::currentTime().toString();
 }
 
 
-void MainWin::desktopNotificationClosed(uint id, uint reason)
-{
-        qDebug() << "OID: " << notificationId << " ID: " << id << " Reason: " << reason << " Time: " << QTime::currentTime().toString();
-        notificationId = 0;
+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();
+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) {