/***************************************************************************
- * Copyright (C) 2005-2013 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 "chatviewsearchcontroller.h"
#include "chatviewsettings.h"
#include "client.h"
-#include "iconloader.h"
+#include "icon.h"
#include "multilineedit.h"
#include "qtui.h"
#include "settings.h"
BufferWidget::BufferWidget(QWidget *parent)
: AbstractBufferContainer(parent),
_chatViewSearchController(new ChatViewSearchController(this)),
- _autoMarkerLine(true)
+ _autoMarkerLine(true),
+ _autoMarkerLineOnLostFocus(true)
{
ui.setupUi(this);
layout()->setContentsMargins(0, 0, 0, 0);
_chatViewSearchController->setSearchMsgs(ui.searchBar->searchMsgsBox()->isChecked());
_chatViewSearchController->setSearchOnlyRegularMsgs(ui.searchBar->searchOnlyRegularMsgsBox()->isChecked());
- connect(ui.searchBar, SIGNAL(searchChanged(const QString &)),
- _chatViewSearchController, SLOT(setSearchString(const QString &)));
- connect(ui.searchBar->caseSensitiveBox(), SIGNAL(toggled(bool)),
- _chatViewSearchController, SLOT(setCaseSensitive(bool)));
- connect(ui.searchBar->searchSendersBox(), SIGNAL(toggled(bool)),
- _chatViewSearchController, SLOT(setSearchSenders(bool)));
- connect(ui.searchBar->searchMsgsBox(), SIGNAL(toggled(bool)),
- _chatViewSearchController, SLOT(setSearchMsgs(bool)));
- connect(ui.searchBar->searchOnlyRegularMsgsBox(), SIGNAL(toggled(bool)),
- _chatViewSearchController, SLOT(setSearchOnlyRegularMsgs(bool)));
- connect(ui.searchBar->searchUpButton(), SIGNAL(clicked()),
- _chatViewSearchController, SLOT(highlightPrev()));
- connect(ui.searchBar->searchDownButton(), SIGNAL(clicked()),
- _chatViewSearchController, SLOT(highlightNext()));
-
- connect(ui.searchBar, SIGNAL(hidden()), this, SLOT(setFocus()));
-
- connect(_chatViewSearchController, SIGNAL(newCurrentHighlight(QGraphicsItem *)),
- this, SLOT(scrollToHighlight(QGraphicsItem *)));
+ connect(ui.searchBar, &ChatViewSearchBar::searchChanged,
+ _chatViewSearchController, &ChatViewSearchController::setSearchString);
+ connect(ui.searchBar->caseSensitiveBox(), &QAbstractButton::toggled,
+ _chatViewSearchController, &ChatViewSearchController::setCaseSensitive);
+ connect(ui.searchBar->searchSendersBox(), &QAbstractButton::toggled,
+ _chatViewSearchController, &ChatViewSearchController::setSearchSenders);
+ connect(ui.searchBar->searchMsgsBox(), &QAbstractButton::toggled,
+ _chatViewSearchController, &ChatViewSearchController::setSearchMsgs);
+ connect(ui.searchBar->searchOnlyRegularMsgsBox(), &QAbstractButton::toggled,
+ _chatViewSearchController, &ChatViewSearchController::setSearchOnlyRegularMsgs);
+ connect(ui.searchBar->searchUpButton(), &QAbstractButton::clicked,
+ _chatViewSearchController, &ChatViewSearchController::highlightPrev);
+ connect(ui.searchBar->searchDownButton(), &QAbstractButton::clicked,
+ _chatViewSearchController, &ChatViewSearchController::highlightNext);
+
+ connect(ui.searchBar, &ChatViewSearchBar::hidden, this, selectOverload<>(&QWidget::setFocus));
+
+ connect(_chatViewSearchController, &ChatViewSearchController::newCurrentHighlight,
+ this, &BufferWidget::scrollToHighlight);
ActionCollection *coll = QtUi::actionCollection();
-
- Action *zoomInChatview = coll->add<Action>("ZoomInChatView", this, SLOT(zoomIn()));
- zoomInChatview->setText(tr("Zoom In"));
- zoomInChatview->setIcon(SmallIcon("zoom-in"));
- zoomInChatview->setShortcut(QKeySequence::ZoomIn);
-
- Action *zoomOutChatview = coll->add<Action>("ZoomOutChatView", this, SLOT(zoomOut()));
- zoomOutChatview->setIcon(SmallIcon("zoom-out"));
- zoomOutChatview->setText(tr("Zoom Out"));
- zoomOutChatview->setShortcut(QKeySequence::ZoomOut);
-
- Action *zoomOriginalChatview = coll->add<Action>("ZoomOriginalChatView", this, SLOT(zoomOriginal()));
- zoomOriginalChatview->setIcon(SmallIcon("zoom-original"));
- zoomOriginalChatview->setText(tr("Actual Size"));
- //zoomOriginalChatview->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0)); // used for RTS switching
-
- Action *setMarkerLine = coll->add<Action>("SetMarkerLineToBottom", this, SLOT(setMarkerLine()));
- setMarkerLine->setText(tr("Set Marker Line"));
- setMarkerLine->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
-
- Action *jumpToMarkerLine = QtUi::actionCollection("Navigation")->add<Action>("JumpToMarkerLine", this, SLOT(jumpToMarkerLine()));
- jumpToMarkerLine->setText(tr("Go to Marker Line"));
- jumpToMarkerLine->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_K));
+ coll->addActions({
+ {"ZoomInChatView", new Action{icon::get("zoom-in"), tr("Zoom In"), coll, this, &BufferWidget::zoomIn, QKeySequence::ZoomIn}},
+ {"ZoomOutChatView", new Action{icon::get("zoom-out"), tr("Zoom Out"), coll, this, &BufferWidget::zoomOut, QKeySequence::ZoomOut}},
+ {"ZoomOriginalChatView", new Action{icon::get("zoom-original"), tr("Actual Size"), coll, this, &BufferWidget::zoomOriginal}},
+ {"SetMarkerLineToBottom", new Action{tr("Set Marker Line"), coll, this, [this]() { setMarkerLine(); }, QKeySequence(Qt::CTRL + Qt::Key_R)}}
+ });
+ coll = QtUi::actionCollection("Navigation");
+ coll->addAction("JumpToMarkerLine", new Action{tr("Go to Marker Line"), coll, this, [this]() { jumpToMarkerLine(); }, QKeySequence(Qt::CTRL + Qt::Key_K)});
ChatViewSettings s;
s.initAndNotify("AutoMarkerLine", this, SLOT(setAutoMarkerLine(QVariant)), true);
+ s.initAndNotify("AutoMarkerLineOnLostFocus", this, SLOT(setAutoMarkerLineOnLostFocus(QVariant)), true);
}
BufferWidget::~BufferWidget()
{
delete _chatViewSearchController;
- _chatViewSearchController = 0;
+ _chatViewSearchController = nullptr;
}
_autoMarkerLine = v.toBool();
}
+void BufferWidget::setAutoMarkerLineOnLostFocus(const QVariant &v)
+{
+ _autoMarkerLineOnLostFocus = v.toBool();
+}
+
AbstractChatView *BufferWidget::createChatView(BufferId id)
{
ui.stackedWidget->setCurrentWidget(ui.page);
}
else {
- ChatView *view = qobject_cast<ChatView *>(_chatViews.value(id));
+ auto *view = qobject_cast<ChatView *>(_chatViews.value(id));
Q_ASSERT(view);
ui.stackedWidget->setCurrentWidget(view);
_chatViewSearchController->setScene(view->scene());
void BufferWidget::scrollToHighlight(QGraphicsItem *highlightItem)
{
- ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+ auto *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
if (view) {
view->centerOn(highlightItem);
}
void BufferWidget::zoomIn()
{
- ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+ auto *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
if (view)
view->zoomIn();
}
void BufferWidget::zoomOut()
{
- ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+ auto *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
if (view)
view->zoomOut();
}
void BufferWidget::zoomOriginal()
{
- ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+ auto *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
if (view)
view->zoomOriginal();
}
if (event->type() != QEvent::KeyPress)
return false;
- QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+ auto *keyEvent = static_cast<QKeyEvent *>(event);
- MultiLineEdit *inputLine = qobject_cast<MultiLineEdit *>(watched);
+ auto *inputLine = qobject_cast<MultiLineEdit *>(watched);
if (!inputLine)
return false;
if (keyEvent == QKeySequence::Copy) {
if (inputLine->hasSelectedText())
return false;
- ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+ auto *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
if (view)
view->scene()->selectionToClipboard();
return true;
case Qt::Key_Down:
if (!(keyEvent->modifiers() & Qt::ShiftModifier))
return false;
+ // fallthrough
case Qt::Key_PageUp:
case Qt::Key_PageDown:
// static cast to access public qobject::event
void BufferWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous)
{
- ChatView *prevView = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+ auto *prevView = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
AbstractBufferContainer::currentChanged(current, previous); // switch first to avoid a redraw
// we need to hide the marker line if it's already/still at the bottom of the view (and not scrolled up)
- ChatView *curView = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+ auto *curView = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
if (curView) {
BufferId curBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
if (curBufferId.isValid()) {
if (lastLine) {
QModelIndex idx = lastLine->index();
MsgId msgId = idx.data(MessageModel::MsgIdRole).value<MsgId>();
+ BufferId bufId = view->scene()->singleBufferId();
if (!allowGoingBack) {
- BufferId bufId = view->scene()->singleBufferId();
MsgId oldMsgId = Client::markerLine(bufId);
if (oldMsgId.isValid() && msgId <= oldMsgId)
return;
}
- view->setMarkerLine(msgId);
+ Client::setMarkerLine(bufId, msgId);
}
}
projects / quassel.git / blobdiff