Switch to correct buffer when indicator is activated.

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

diff --git a/src/qtui/indicatornotificationbackend.cpp b/src/qtui/indicatornotificationbackend.cpp
index a1adf49..3b808dd 100644 (file)
--- a/src/qtui/indicatornotificationbackend.cpp
+++ b/src/qtui/indicatornotificationbackend.cpp
@@ -45,6 +45,8 @@ IndicatorNotificationBackend::IndicatorNotificationBackend(QObject *parent)
   _server = QIndicate::Server::defaultInstance();
   _server->setType("message.im");
   _server->setDesktopFile(DESKTOP_FILE);
+  connect(_server, SIGNAL(serverDisplay()), QtUi::mainWindow(), SLOT(forceActivated()));
+
   if (_enabled) {
     _server->show();
   }
@@ -66,6 +68,8 @@ void IndicatorNotificationBackend::notify(const Notification &notification) {
   if(!indicator) {
     indicator = new Indicator;
     _indicatorHash.insert(bufferId, indicator);
+    connect(indicator, SIGNAL(display()),
+      SLOT(indicatorDisplayed()));
   }
   indicator->lastNotificationId = notification.notificationId;
 
@@ -79,8 +83,16 @@ void IndicatorNotificationBackend::notify(const Notification &notification) {
       .arg(notification.sender);
   }
   indicator->setProperty("sender", sender);
+
   indicator->setProperty("time", QTime::currentTime());
-  qDebug() << "FIXME icon";
+
+  QModelIndex index = Client::networkModel()->bufferIndex(bufferId);
+  QVariant icon = QtUi::style()->bufferViewItemData(index, Qt::DecorationRole);
+  if (icon.canConvert<QPixmap>()) {
+    QImage image = icon.value<QPixmap>().toImage();
+    indicator->setProperty("icon", image);
+  }
+
   indicator->show();
 }
 
@@ -116,6 +128,11 @@ void IndicatorNotificationBackend::enabledChanged(const QVariant &v) {
   }
 }
 
+void IndicatorNotificationBackend::indicatorDisplayed() {
+  Indicator *indicator = static_cast<Indicator*>(sender());
+  emit activated(indicator->lastNotificationId);
+}
+
 SettingsPage *IndicatorNotificationBackend::createConfigWidget() const {
   return new ConfigWidget();
 }