/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2018 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 <QIcon>
#include <QMenu>
#include <QContextMenuEvent>
+#include "action.h"
+#include "buffermodel.h"
#include "chatmonitorfilter.h"
#include "chatlinemodel.h"
#include "chatitem.h"
#include "chatscene.h"
#include "client.h"
+#include "clientignorelistmanager.h"
+#include "icon.h"
#include "networkmodel.h"
-#include "buffermodel.h"
#include "messagemodel.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)
{
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);
}
{
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, SLOT(setShowOwnMessages(bool)));
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, SLOT(showFieldsChanged(bool)));
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, SLOT(showFieldsChanged(bool)));
showBufferAction->setCheckable(true);
showBufferAction->setChecked(_filter->showFields() & ChatMonitorFilter::BufferField);
showBufferAction->setData(ChatMonitorFilter::BufferField);
+ menu->addAction(showBufferAction);
}
menu->addSeparator();
- menu->addAction(QIcon::fromTheme("configure"), tr("Configure..."), this, SLOT(showSettingsPage()));
+ menu->addAction(new Action(icon::get("configure"), tr("Configure..."), menu, this, SLOT(showSettingsPage())));
}
void ChatMonitorView::showFieldsChanged(bool checked)
{
- QAction *showAction = qobject_cast<QAction *>(sender());
+ auto *showAction = qobject_cast<QAction *>(sender());
if (!showAction)
return;
void ChatMonitorView::coreConnectionStateChanged(bool connected)
{
if (connected)
- connect(Client::ignoreListManager(), SIGNAL(ignoreListChanged()), _filter, SLOT(invalidateFilter()));
+ connect(Client::ignoreListManager(), &ClientIgnoreListManager::ignoreListChanged, _filter, &ChatMonitorFilter::invalidateFilter);
}