X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fqtui.cpp;h=4623142ccbbc1961714edde6133fbe9425496313;hb=5941801a1a5a61dc6d3e409ba33ab413adc9005f;hp=2efdf72ea229d67874f3200ea9887cf5aeb51ac8;hpb=34cbd014160c25232e6f407ba6dcd0fe92ae7c17;p=quassel.git diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp index 2efdf72e..4623142c 100644 --- a/src/qtui/qtui.cpp +++ b/src/qtui/qtui.cpp @@ -21,6 +21,7 @@ #include "qtui.h" #include "abstractnotificationbackend.h" +#include "buffermodel.h" #include "chatlinemodel.h" #include "contextmenuactionprovider.h" #include "mainwin.h" @@ -31,6 +32,10 @@ #include "types.h" #include "util.h" +#ifdef Q_WS_X11 +# include +#endif + QPointer QtUi::_instance = 0; QPointer QtUi::_mainWin = 0; QList QtUi::_notificationBackends; @@ -88,7 +93,7 @@ void QtUi::disconnectedFromCore() { void QtUi::registerNotificationBackend(AbstractNotificationBackend *backend) { if(!_notificationBackends.contains(backend)) { _notificationBackends.append(backend); - instance()->connect(backend, SIGNAL(activated()), SLOT(notificationActivated())); + instance()->connect(backend, SIGNAL(activated(uint)), SLOT(notificationActivated(uint))); } } @@ -145,8 +150,30 @@ const QList &QtUi::activeNotification return _notifications; } -void QtUi::notificationActivated() { - // this might not work with some window managers +void QtUi::notificationActivated(uint notificationId) { + if(notificationId != 0) { + QList::iterator i = _notifications.begin(); + while(i != _notifications.end()) { + if((*i).notificationId == notificationId) { + BufferId bufId = (*i).bufferId; + if(bufId.isValid()) + Client::bufferModel()->switchToBuffer(bufId); + _notifications.erase(i); + break; + } + } + } + +#ifdef Q_WS_X11 + // Bypass focus stealing prevention + QX11Info::setAppUserTime(QX11Info::appTime()); +#endif + + if(_mainWin->windowState() & Qt::WindowMinimized) { + // restore + _mainWin->setWindowState((_mainWin->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); + _mainWin->show(); + } _mainWin->raise(); _mainWin->activateWindow(); }