#include "qtuisettings.h"
#include "jumpkeyhandler.h"
-#include "uisettings.h"
-
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
#include "settingspages/networkssettingspage.h"
-
+#include "settingspages/notificationssettingspage.h"
#include "debugconsole.h"
#include "global.h"
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",
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.value("NotificationDesktopTimeout", QVariant(5000)).toInt() // Timeout in milliseconds
);
- if (!reply.isValid())
- {
- /* ERROR */
- qDebug() << "Error on sending notification...";
- return;
- }
+ if(!reply.isValid()) {
+ /* ERROR */
+ // could also happen if no notification service runs, so... whatever :)
+ //qDebug() << "Error on sending notification..." << reply.error();
+ 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) {