projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a rebase oops
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
7efe5f2
..
b75af1b
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-45,8
+45,6
@@
#include "qtuisettings.h"
#include "jumpkeyhandler.h"
#include "qtuisettings.h"
#include "jumpkeyhandler.h"
-#include "uisettings.h"
-
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
@@
-100,12
+98,6
@@
MainWin::MainWin(QtUi *_gui, QWidget *parent)
installEventFilter(new JumpKeyHandler(this));
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",
#ifdef HAVE_DBUS
desktopNotifications = new org::freedesktop::Notifications(
"org.freedesktop.Notifications",
@@
-662,24
+654,25
@@
void MainWin::sendDesktopNotification(const QString &title, const QString &messa
if(!reply.isValid()) {
/* ERROR */
if(!reply.isValid()) {
/* ERROR */
- qDebug() << "Error on sending notification..." << reply;
+ // could also happen if no notification service runs, so... whatever :)
+ //qDebug() << "Error on sending notification..." << reply.error();
return;
}
notificationId = reply.value();
return;
}
notificationId = reply.value();
- qDebug() << "ID: " << notificationId << " Time: " << QTime::currentTime().toString();
+
//
qDebug() << "ID: " << notificationId << " Time: " << QTime::currentTime().toString();
}
void MainWin::desktopNotificationClosed(uint id, uint reason) {
}
void MainWin::desktopNotificationClosed(uint id, uint reason) {
- qDebug() << "OID: " << notificationId << " ID: " << id << " Reason: " << reason << " Time: " << QTime::currentTime().toString();
+
//
qDebug() << "OID: " << notificationId << " ID: " << id << " Reason: " << reason << " Time: " << QTime::currentTime().toString();
notificationId = 0;
}
void MainWin::desktopNotificationInvoked(uint id, const QString & action) {
notificationId = 0;
}
void MainWin::desktopNotificationInvoked(uint id, const QString & action) {
- qDebug() << "OID: " << notificationId << " ID: " << id << " Action: " << action << " Time: " << QTime::currentTime().toString();
+
//
qDebug() << "OID: " << notificationId << " ID: " << id << " Action: " << action << " Time: " << QTime::currentTime().toString();
}
#else /* HAVE_DBUS */
}
#else /* HAVE_DBUS */