X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=9cc1c3e0ca3c75130e88fbd5cf7ea03bbedaed51;hb=0c498574d2f26bae581bc8f9a01e739e1f9c3872;hp=ceedb9b1147b388e8fb7022cecfd14a97695ba9d;hpb=5c78a50fa720e5f82fcaa03c0176feab71d74c8e;p=quassel.git diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index ceedb9b1..9cc1c3e0 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -22,41 +22,34 @@ #include "aboutdlg.h" #include "action.h" #include "actioncollection.h" -#include "bufferview.h" -#include "bufferviewconfig.h" -#include "bufferviewfilter.h" +#include "buffermodel.h" #include "bufferviewmanager.h" #include "channellistdlg.h" #include "chatlinemodel.h" #include "chatmonitorfilter.h" #include "chatmonitorview.h" #include "chatview.h" -#include "chatviewsearchbar.h" #include "client.h" #include "clientbacklogmanager.h" #include "coreinfodlg.h" #include "coreconnectdlg.h" #include "iconloader.h" +#include "inputwidget.h" +#include "irclistmodel.h" +#include "jumpkeyhandler.h" #include "msgprocessorstatuswidget.h" -#include "qtuimessageprocessor.h" -#include "qtuiapplication.h" -#include "networkmodel.h" -#include "buffermodel.h" #include "nicklistwidget.h" +#include "qtuiapplication.h" +#include "qtuimessageprocessor.h" +#include "qtuisettings.h" +#include "sessionsettings.h" #include "settingsdlg.h" #include "settingspagedlg.h" -#include "signalproxy.h" #include "topicwidget.h" -#include "inputwidget.h" -#include "irclistmodel.h" #include "verticaldock.h" -#include "uisettings.h" -#include "qtuisettings.h" -#include "jumpkeyhandler.h" -#include "sessionsettings.h" -#include "selectionmodelsynchronizer.h" -#include "mappedselectionmodel.h" +#include "desktopnotificationbackend.h" +#include "systraynotificationbackend.h" #include "settingspages/aliasessettingspage.h" #include "settingspages/appearancesettingspage.h" @@ -69,36 +62,24 @@ #include "settingspages/networkssettingspage.h" #include "settingspages/notificationssettingspage.h" -#include "qtuistyle.h" - MainWin::MainWin(QWidget *parent) : QMainWindow(parent), coreLagLabel(new QLabel()), sslLabel(new QLabel()), msgProcessorStatusWidget(new MsgProcessorStatusWidget()), - _titleSetter(this), _trayIcon(new QSystemTrayIcon(this)), - - activeTrayIcon(DesktopIcon("quassel_newmessage", IconLoader::SizeEnormous)), - onlineTrayIcon(DesktopIcon("quassel", IconLoader::SizeEnormous)), - offlineTrayIcon(DesktopIcon("quassel_disconnected", IconLoader::SizeEnormous)), - trayIconActive(false), - - timer(new QTimer(this)), _actionCollection(new ActionCollection(this)) { - UiSettings uiSettings; + QtUiSettings uiSettings; QString style = uiSettings.value("Style", QString("")).toString(); if(style != "") { QApplication::setStyle(style); } ui.setupUi(this); setWindowTitle("Quassel IRC"); - setWindowIcon(offlineTrayIcon); - qApp->setWindowIcon(offlineTrayIcon); - systemTrayIcon()->setIcon(offlineTrayIcon); setWindowIconText("Quassel IRC"); + updateIcon(); QtUi::actionCollection()->addAssociatedWidget(this); @@ -106,15 +87,11 @@ MainWin::MainWin(QWidget *parent) installEventFilter(new JumpKeyHandler(this)); + QtUi::registerNotificationBackend(new SystrayNotificationBackend(this)); #ifdef HAVE_DBUS - desktopNotifications = new org::freedesktop::Notifications( - "org.freedesktop.Notifications", - "/org/freedesktop/Notifications", - QDBusConnection::sessionBus(), this); - notificationId = 0; - connect(desktopNotifications, SIGNAL(NotificationClosed(uint, uint)), this, SLOT(desktopNotificationClosed(uint, uint))); - connect(desktopNotifications, SIGNAL(ActionInvoked(uint, const QString&)), this, SLOT(desktopNotificationInvoked(uint, const QString&))); + QtUi::registerNotificationBackend(new DesktopNotificationBackend(this)); #endif + QtUiApplication* app = qobject_cast qApp; connect(app, SIGNAL(saveStateToSession(const QString&)), this, SLOT(saveStateToSession(const QString&))); connect(app, SIGNAL(saveStateToSessionSettings(SessionSettings&)), this, SLOT(saveStateToSessionSettings(SessionSettings&))); @@ -180,6 +157,17 @@ MainWin::~MainWin() { s.setValue("MainWinState", saveState()); } +void MainWin::updateIcon() { + QPixmap icon; + if(Client::isConnected()) + icon = DesktopIcon("quassel", IconLoader::SizeEnormous); + else + icon = DesktopIcon("quassel_disconnected", IconLoader::SizeEnormous); + setWindowIcon(icon); + qApp->setWindowIcon(icon); + systemTrayIcon()->setIcon(icon); +} + void MainWin::setupActions() { // TODO don't get these from *.ui anymore... we shouldn't need one ui.actionQuit->setIcon(SmallIcon("application-exit")); @@ -370,9 +358,8 @@ void MainWin::saveStatusBarStatus(bool enabled) { } void MainWin::setupSystray() { - connect(timer, SIGNAL(timeout()), this, SLOT(makeTrayIconBlink())); connect(Client::messageModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)), - this, SLOT(messagesInserted(const QModelIndex &, int, int))); + SLOT(messagesInserted(const QModelIndex &, int, int))); systrayMenu = new QMenu(this); systrayMenu->addAction(ui.actionAboutQuassel); @@ -426,11 +413,9 @@ void MainWin::setConnectedState() { ui.menuViews->setEnabled(true); ui.bufferWidget->show(); statusBar()->showMessage(tr("Connected to core.")); - setWindowIcon(onlineTrayIcon); - qApp->setWindowIcon(onlineTrayIcon); - systemTrayIcon()->setIcon(onlineTrayIcon); if(sslLabel->width() == 0) sslLabel->setPixmap(SmallIcon("security-low")); + updateIcon(); } void MainWin::loadLayout() { @@ -484,10 +469,8 @@ void MainWin::setDisconnectedState() { ui.menuViews->setEnabled(false); ui.bufferWidget->hide(); statusBar()->showMessage(tr("Not connected to core.")); - setWindowIcon(offlineTrayIcon); - qApp->setWindowIcon(offlineTrayIcon); - systemTrayIcon()->setIcon(offlineTrayIcon); sslLabel->setPixmap(QPixmap()); + updateIcon(); } void MainWin::showCoreConnectionDlg(bool autoConnect) { @@ -600,114 +583,20 @@ void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) { BufferInfo::Type bufType = Client::networkModel()->bufferType(bufId); if(flags & Message::Highlight || bufType == BufferInfo::QueryBuffer) { - QString title = Client::networkModel()->networkName(bufId) + " - " + Client::networkModel()->bufferName(bufId); - - // FIXME Don't instantiate this for every highlight... - UiSettings uiSettings; - - bool displayBubble = uiSettings.value("NotificationBubble", QVariant(true)).toBool(); - bool displayDesktop = uiSettings.value("NotificationDesktop", QVariant(true)).toBool(); - if(displayBubble || displayDesktop) { - if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) { - QString text = idx.data(ChatLineModel::DisplayRole).toString(); - if(displayBubble) displayTrayIconMessage(title, text); -# ifdef HAVE_DBUS - if(displayDesktop) sendDesktopNotification(title, text); -# endif - } - if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) { - QApplication::alert(this); - setTrayIconActivity(true); - } - } + QModelIndex senderIdx = Client::messageModel()->index(i, ChatLineModel::SenderColumn); + QString sender = senderIdx.data(ChatLineModel::EditRole).toString(); + QString contents = idx.data(ChatLineModel::DisplayRole).toString(); + QtUi::invokeNotification(bufId, sender, contents); } } } bool MainWin::event(QEvent *event) { if(event->type() == QEvent::WindowActivate) - setTrayIconActivity(false); + QtUi::closeNotifications(); return QMainWindow::event(event); } -#ifdef HAVE_DBUS - -/* -Using the notification-daemon from Freedesktop's Galago project -http://www.galago-project.org/specs/notification/0.9/x408.html#command-notify -*/ -void MainWin::sendDesktopNotification(const QString &title, const QString &message) { - QStringList actions; - QMap hints; - UiSettings uiSettings; - - hints["x"] = uiSettings.value("NotificationDesktopHintX", QVariant(0)).toInt(); // Standard hint: x location for the popup to show up - hints["y"] = uiSettings.value("NotificationDesktopHintY", QVariant(0)).toInt(); // Standard hint: y location for the popup to show up - - actions << "click" << "Click Me!"; - - QDBusReply reply = desktopNotifications->Notify( - "Quassel", // Application name - notificationId, // ID of previous notification to replace - "", // Icon to display - title, // Summary / Header of the message to display - QString("%1: %2:\n%3").arg(QTime::currentTime().toString()).arg(title).arg(message), // Body of the message to display - actions, // Actions from which the user may choose - hints, // Hints to the server displaying the message - uiSettings.value("NotificationDesktopTimeout", QVariant(5000)).toInt() // Timeout in milliseconds - ); - - 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(); - - // qDebug() << "ID: " << notificationId << " Time: " << QTime::currentTime().toString(); -} - - -void MainWin::desktopNotificationClosed(uint id, uint reason) { - Q_UNUSED(id); Q_UNUSED(reason); - // qDebug() << "OID: " << notificationId << " ID: " << id << " Reason: " << reason << " Time: " << QTime::currentTime().toString(); - notificationId = 0; -} - - -void MainWin::desktopNotificationInvoked(uint id, const QString & action) { - Q_UNUSED(id); Q_UNUSED(action); - // qDebug() << "OID: " << notificationId << " ID: " << id << " Action: " << action << " Time: " << QTime::currentTime().toString(); -} - -#endif /* HAVE_DBUS */ - -void MainWin::displayTrayIconMessage(const QString &title, const QString &message) { - systemTrayIcon()->showMessage(title, message); -} - -void MainWin::setTrayIconActivity(bool active) { - if(active) { - if(!timer->isActive()) - timer->start(500); - } else { - timer->stop(); - systemTrayIcon()->setIcon(onlineTrayIcon); - } -} - -void MainWin::makeTrayIconBlink() { - if(trayIconActive) { - systemTrayIcon()->setIcon(onlineTrayIcon); - trayIconActive = false; - } else { - systemTrayIcon()->setIcon(activeTrayIcon); - trayIconActive = true; - } -} - void MainWin::clientNetworkCreated(NetworkId id) { const Network *net = Client::network(id); QAction *act = new QAction(net->networkName(), this); @@ -771,8 +660,6 @@ void MainWin::connectOrDisconnectFromNet() { else net->requestDisconnect(); } - - void MainWin::on_actionDebugNetworkModel_triggered(bool) { QTreeView *view = new QTreeView; view->setAttribute(Qt::WA_DeleteOnClose);