X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=1df7ec4e6d3f9427a6142fbfe9f869c046e556ac;hp=41e98a51d5a9cf2c728837705086d9b12ba34321;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=f9efdde7f3a6004af8f834c409cfa6ae1d877692 diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp index 41e98a51..1df7ec4e 100644 --- a/src/qtui/bufferwidget.cpp +++ b/src/qtui/bufferwidget.cpp @@ -18,14 +18,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include "bufferwidget.h" + #include +#include #include #include #include "action.h" #include "actioncollection.h" -#include "bufferwidget.h" #include "chatline.h" #include "chatview.h" #include "chatviewsearchbar.h" @@ -37,11 +38,11 @@ #include "qtui.h" #include "settings.h" -BufferWidget::BufferWidget(QWidget *parent) - : AbstractBufferContainer(parent), - _chatViewSearchController(new ChatViewSearchController(this)), - _autoMarkerLine(true), - _autoMarkerLineOnLostFocus(true) +BufferWidget::BufferWidget(QWidget* parent) + : AbstractBufferContainer(parent) + , _chatViewSearchController(new ChatViewSearchController(this)) + , _autoMarkerLine(true) + , _autoMarkerLineOnLostFocus(true) { ui.setupUi(this); layout()->setContentsMargins(0, 0, 0, 0); @@ -53,63 +54,56 @@ BufferWidget::BufferWidget(QWidget *parent) _chatViewSearchController->setSearchMsgs(ui.searchBar->searchMsgsBox()->isChecked()); _chatViewSearchController->setSearchOnlyRegularMsgs(ui.searchBar->searchOnlyRegularMsgsBox()->isChecked()); - 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::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); + connect(_chatViewSearchController, &ChatViewSearchController::newCurrentHighlight, this, &BufferWidget::scrollToHighlight); - ActionCollection *coll = QtUi::actionCollection(); - 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)}} - }); + ActionCollection* coll = QtUi::actionCollection(); + 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)}); + 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); + s.initAndNotify("AutoMarkerLine", this, &BufferWidget::setAutoMarkerLine, true); + s.initAndNotify("AutoMarkerLineOnLostFocus", this, &BufferWidget::setAutoMarkerLineOnLostFocus, true); } - BufferWidget::~BufferWidget() { delete _chatViewSearchController; _chatViewSearchController = nullptr; } - -void BufferWidget::setAutoMarkerLine(const QVariant &v) +void BufferWidget::setAutoMarkerLine(const QVariant& v) { _autoMarkerLine = v.toBool(); } -void BufferWidget::setAutoMarkerLineOnLostFocus(const QVariant &v) +void BufferWidget::setAutoMarkerLineOnLostFocus(const QVariant& v) { _autoMarkerLineOnLostFocus = v.toBool(); } - -AbstractChatView *BufferWidget::createChatView(BufferId id) +AbstractChatView* BufferWidget::createChatView(BufferId id) { - ChatView *chatView; + ChatView* chatView; chatView = new ChatView(id, this); chatView->setBufferContainer(this); _chatViews[id] = chatView; @@ -118,83 +112,76 @@ AbstractChatView *BufferWidget::createChatView(BufferId id) return chatView; } - void BufferWidget::removeChatView(BufferId id) { - QWidget *view = _chatViews.value(id, 0); - if (!view) return; + QWidget* view = _chatViews.value(id, 0); + if (!view) + return; ui.stackedWidget->removeWidget(view); view->deleteLater(); _chatViews.take(id); } - void BufferWidget::showChatView(BufferId id) { if (!id.isValid()) { ui.stackedWidget->setCurrentWidget(ui.page); } else { - auto *view = qobject_cast(_chatViews.value(id)); + auto* view = qobject_cast(_chatViews.value(id)); Q_ASSERT(view); ui.stackedWidget->setCurrentWidget(view); _chatViewSearchController->setScene(view->scene()); } } - -void BufferWidget::scrollToHighlight(QGraphicsItem *highlightItem) +void BufferWidget::scrollToHighlight(QGraphicsItem* highlightItem) { - auto *view = qobject_cast(ui.stackedWidget->currentWidget()); + auto* view = qobject_cast(ui.stackedWidget->currentWidget()); if (view) { view->centerOn(highlightItem); } } - void BufferWidget::zoomIn() { - auto *view = qobject_cast(ui.stackedWidget->currentWidget()); + auto* view = qobject_cast(ui.stackedWidget->currentWidget()); if (view) view->zoomIn(); } - void BufferWidget::zoomOut() { - auto *view = qobject_cast(ui.stackedWidget->currentWidget()); + auto* view = qobject_cast(ui.stackedWidget->currentWidget()); if (view) view->zoomOut(); } - void BufferWidget::zoomOriginal() { - auto *view = qobject_cast(ui.stackedWidget->currentWidget()); + auto* view = qobject_cast(ui.stackedWidget->currentWidget()); if (view) view->zoomOriginal(); } - -void BufferWidget::addActionsToMenu(QMenu *menu, const QPointF &pos) +void BufferWidget::addActionsToMenu(QMenu* menu, const QPointF& pos) { Q_UNUSED(pos); - ActionCollection *coll = QtUi::actionCollection(); + ActionCollection* coll = QtUi::actionCollection(); menu->addSeparator(); menu->addAction(coll->action("ZoomInChatView")); menu->addAction(coll->action("ZoomOutChatView")); menu->addAction(coll->action("ZoomOriginalChatView")); } - -bool BufferWidget::eventFilter(QObject *watched, QEvent *event) +bool BufferWidget::eventFilter(QObject* watched, QEvent* event) { if (event->type() != QEvent::KeyPress) return false; - auto *keyEvent = static_cast(event); + auto* keyEvent = static_cast(event); - auto *inputLine = qobject_cast(watched); + auto* inputLine = qobject_cast(watched); if (!inputLine) return false; @@ -202,7 +189,7 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event) if (keyEvent == QKeySequence::Copy) { if (inputLine->hasSelectedText()) return false; - auto *view = qobject_cast(ui.stackedWidget->currentWidget()); + auto* view = qobject_cast(ui.stackedWidget->currentWidget()); if (view) view->scene()->selectionToClipboard(); return true; @@ -221,21 +208,20 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event) case Qt::Key_PageUp: case Qt::Key_PageDown: // static cast to access public qobject::event - return static_cast(ui.stackedWidget->currentWidget())->event(event); + return static_cast(ui.stackedWidget->currentWidget())->event(event); default: return false; } } - -void BufferWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) +void BufferWidget::currentChanged(const QModelIndex& current, const QModelIndex& previous) { - auto *prevView = qobject_cast(ui.stackedWidget->currentWidget()); + auto* prevView = qobject_cast(ui.stackedWidget->currentWidget()); - AbstractBufferContainer::currentChanged(current, previous); // switch first to avoid a redraw + 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) - auto *curView = qobject_cast(ui.stackedWidget->currentWidget()); + auto* curView = qobject_cast(ui.stackedWidget->currentWidget()); if (curView) { BufferId curBufferId = current.data(NetworkModel::BufferIdRole).value(); if (curBufferId.isValid()) { @@ -251,15 +237,14 @@ void BufferWidget::currentChanged(const QModelIndex ¤t, const QModelIndex setMarkerLine(prevView, false); } - -void BufferWidget::setMarkerLine(ChatView *view, bool allowGoingBack) +void BufferWidget::setMarkerLine(ChatView* view, bool allowGoingBack) { if (!view) - view = qobject_cast(ui.stackedWidget->currentWidget()); + view = qobject_cast(ui.stackedWidget->currentWidget()); if (!view) return; - ChatLine *lastLine = view->lastVisibleChatLine(); + ChatLine* lastLine = view->lastVisibleChatLine(); if (lastLine) { QModelIndex idx = lastLine->index(); MsgId msgId = idx.data(MessageModel::MsgIdRole).value(); @@ -274,11 +259,10 @@ void BufferWidget::setMarkerLine(ChatView *view, bool allowGoingBack) } } - -void BufferWidget::jumpToMarkerLine(ChatView *view, bool requestBacklog) +void BufferWidget::jumpToMarkerLine(ChatView* view, bool requestBacklog) { if (!view) - view = qobject_cast(ui.stackedWidget->currentWidget()); + view = qobject_cast(ui.stackedWidget->currentWidget()); if (!view) return;