/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "chatmonitorview.h"
#include <QAction>
-#include <QMenu>
#include <QContextMenuEvent>
+#include <QMenu>
-#include "chatmonitorfilter.h"
-#include "chatlinemodel.h"
+#include "action.h"
+#include "buffermodel.h"
#include "chatitem.h"
+#include "chatlinemodel.h"
+#include "chatmonitorfilter.h"
#include "chatscene.h"
#include "client.h"
-#include "iconloader.h"
-#include "networkmodel.h"
-#include "buffermodel.h"
+#include "clientignorelistmanager.h"
+#include "icon.h"
#include "messagemodel.h"
+#include "networkmodel.h"
#include "qtuisettings.h"
#include "settingspagedlg.h"
+
#include "settingspages/chatmonitorsettingspage.h"
-#include "clientignorelistmanager.h"
-ChatMonitorView::ChatMonitorView(ChatMonitorFilter *filter, QWidget *parent)
- : ChatView(filter, parent),
- _filter(filter)
+ChatMonitorView::ChatMonitorView(ChatMonitorFilter* filter, QWidget* parent)
+ : ChatView(filter, parent)
+ , _filter(filter)
{
scene()->setSenderCutoffMode(ChatScene::CutoffLeft);
- connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
+ // The normal message prefixes get replaced by the network and buffer name. Re-add brackets for
+ // all message types.
+ scene()->setAlwaysBracketSender(true);
+ connect(Client::instance(), &Client::coreConnectionStateChanged, this, &ChatMonitorView::coreConnectionStateChanged);
}
-
-void ChatMonitorView::addActionsToMenu(QMenu *menu, const QPointF &pos)
+void ChatMonitorView::addActionsToMenu(QMenu* menu, const QPointF& pos)
{
ChatView::addActionsToMenu(menu, pos);
menu->addSeparator();
- QAction *showOwnNicksAction = menu->addAction(tr("Show Own Messages"), _filter, SLOT(setShowOwnMessages(bool)));
+ auto showOwnNicksAction = new Action(tr("Show Own Messages"), menu, _filter, &ChatMonitorFilter::setShowOwnMessages);
showOwnNicksAction->setCheckable(true);
showOwnNicksAction->setChecked(_filter->showOwnMessages());
+ menu->addAction(showOwnNicksAction);
if (scene()->columnByScenePos(pos) == ChatLineModel::SenderColumn) {
menu->addSeparator();
- QAction *showNetworkAction = menu->addAction(tr("Show Network Name"), this, SLOT(showFieldsChanged(bool)));
+ auto showNetworkAction = new Action(tr("Show Network Name"), menu, this, &ChatMonitorView::showFieldsChanged);
showNetworkAction->setCheckable(true);
showNetworkAction->setChecked(_filter->showFields() & ChatMonitorFilter::NetworkField);
showNetworkAction->setData(ChatMonitorFilter::NetworkField);
+ menu->addAction(showNetworkAction);
- QAction *showBufferAction = menu->addAction(tr("Show Buffer Name"), this, SLOT(showFieldsChanged(bool)));
+ auto showBufferAction = new Action(tr("Show Buffer Name"), menu, this, &ChatMonitorView::showFieldsChanged);
showBufferAction->setCheckable(true);
showBufferAction->setChecked(_filter->showFields() & ChatMonitorFilter::BufferField);
showBufferAction->setData(ChatMonitorFilter::BufferField);
+ menu->addAction(showBufferAction);
}
menu->addSeparator();
- menu->addAction(SmallIcon("configure"), tr("Configure..."), this, SLOT(showSettingsPage()));
+ menu->addAction(new Action(icon::get("configure"), tr("Configure..."), menu, this, &ChatMonitorView::showSettingsPage));
}
-
-void ChatMonitorView::mouseDoubleClickEvent(QMouseEvent *event)
+void ChatMonitorView::mouseDoubleClickEvent(QMouseEvent* event)
{
if (scene()->columnByScenePos(event->pos()) != ChatLineModel::SenderColumn) {
ChatView::mouseDoubleClickEvent(event);
return;
}
- ChatItem *chatItem = scene()->chatItemAt(mapToScene(event->pos()));
+ ChatItem* chatItem = scene()->chatItemAt(mapToScene(event->pos()));
if (!chatItem) {
event->ignore();
return;
Client::bufferModel()->switchToBuffer(bufferId);
}
-
void ChatMonitorView::showFieldsChanged(bool checked)
{
- QAction *showAction = qobject_cast<QAction *>(sender());
+ auto* showAction = qobject_cast<QAction*>(sender());
if (!showAction)
return;
_filter->removeShowField(showAction->data().toInt());
}
-
void ChatMonitorView::showSettingsPage()
{
SettingsPageDlg dlg(new ChatMonitorSettingsPage(), this);
dlg.exec();
}
-
// connect only after client is synced to core since ChatMonitorView is created before
// the ignoreListManager
void ChatMonitorView::coreConnectionStateChanged(bool connected)
{
if (connected)
- connect(Client::ignoreListManager(), SIGNAL(ignoreListChanged()), _filter, SLOT(invalidateFilter()));
+ connect(Client::ignoreListManager(), &ClientIgnoreListManager::ignoreListChanged, _filter, &ChatMonitorFilter::invalidateFilter);
}