X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=7b4e9545dcc772fef0474260694dbac0c43a8c79;hp=9ac555f44cee8bf4a3f6ae5f8c648696fba765a9;hb=83efa7dcd9771008e7600b4c35db0dde6e0bc995;hpb=22b225ba81373362e6d02a88cd3a906e8c394aac diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp index 9ac555f4..7b4e9545 100644 --- a/src/qtui/bufferwidget.cpp +++ b/src/qtui/bufferwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,24 +20,28 @@ #include #include +#include #include #include "action.h" #include "actioncollection.h" #include "bufferwidget.h" +#include "chatline.h" #include "chatview.h" #include "chatviewsearchbar.h" #include "chatviewsearchcontroller.h" +#include "chatviewsettings.h" #include "client.h" #include "iconloader.h" -#include "inputline.h" +#include "multilineedit.h" #include "qtui.h" #include "settings.h" BufferWidget::BufferWidget(QWidget *parent) : AbstractBufferContainer(parent), - _chatViewSearchController(new ChatViewSearchController(this)) + _chatViewSearchController(new ChatViewSearchController(this)), + _autoMarkerLine(true) { ui.setupUi(this); layout()->setContentsMargins(0, 0, 0, 0); @@ -49,23 +53,25 @@ BufferWidget::BufferWidget(QWidget *parent) _chatViewSearchController->setSearchMsgs(ui.searchBar->searchMsgsBox()->isChecked()); _chatViewSearchController->setSearchOnlyRegularMsgs(ui.searchBar->searchOnlyRegularMsgsBox()->isChecked()); - connect(ui.searchBar->searchEditLine(), SIGNAL(textChanged(const QString &)), - _chatViewSearchController, SLOT(setSearchString(const QString &))); + connect(ui.searchBar, SIGNAL(searchChanged(const QString &)), + _chatViewSearchController, SLOT(setSearchString(const QString &))); connect(ui.searchBar->caseSensitiveBox(), SIGNAL(toggled(bool)), - _chatViewSearchController, SLOT(setCaseSensitive(bool))); + _chatViewSearchController, SLOT(setCaseSensitive(bool))); connect(ui.searchBar->searchSendersBox(), SIGNAL(toggled(bool)), - _chatViewSearchController, SLOT(setSearchSenders(bool))); + _chatViewSearchController, SLOT(setSearchSenders(bool))); connect(ui.searchBar->searchMsgsBox(), SIGNAL(toggled(bool)), - _chatViewSearchController, SLOT(setSearchMsgs(bool))); + _chatViewSearchController, SLOT(setSearchMsgs(bool))); connect(ui.searchBar->searchOnlyRegularMsgsBox(), SIGNAL(toggled(bool)), - _chatViewSearchController, SLOT(setSearchOnlyRegularMsgs(bool))); + _chatViewSearchController, SLOT(setSearchOnlyRegularMsgs(bool))); connect(ui.searchBar->searchUpButton(), SIGNAL(clicked()), - _chatViewSearchController, SLOT(highlightPrev())); + _chatViewSearchController, SLOT(highlightPrev())); connect(ui.searchBar->searchDownButton(), SIGNAL(clicked()), - _chatViewSearchController, SLOT(highlightNext())); + _chatViewSearchController, SLOT(highlightNext())); + + connect(ui.searchBar, SIGNAL(hidden()), this, SLOT(setFocus())); connect(_chatViewSearchController, SIGNAL(newCurrentHighlight(QGraphicsItem *)), - this, SLOT(scrollToHighlight(QGraphicsItem *))); + this, SLOT(scrollToHighlight(QGraphicsItem *))); ActionCollection *coll = QtUi::actionCollection(); @@ -81,8 +87,19 @@ BufferWidget::BufferWidget(QWidget *parent) Action *zoomOriginalChatview = coll->add("ZoomOriginalChatView", this, SLOT(zoomOriginal())); zoomOriginalChatview->setIcon(SmallIcon("zoom-original")); - zoomOriginalChatview->setText(tr("Zoom Original")); - zoomOriginalChatview->setShortcut(tr("Ctrl+0")); + zoomOriginalChatview->setText(tr("Actual Size")); + //zoomOriginalChatview->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0)); // used for RTS switching + + Action *setMarkerLine = coll->add("SetMarkerLineToBottom", this, SLOT(setMarkerLine())); + setMarkerLine->setText(tr("Set Marker Line")); + setMarkerLine->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R)); + + Action *jumpToMarkerLine = QtUi::actionCollection("Navigation")->add("JumpToMarkerLine", this, SLOT(jumpToMarkerLine())); + jumpToMarkerLine->setText(tr("Go to Marker Line")); + jumpToMarkerLine->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_K)); + + ChatViewSettings s; + s.initAndNotify("AutoMarkerLine", this, SLOT(setAutoMarkerLine(QVariant)), true); } BufferWidget::~BufferWidget() { @@ -90,6 +107,10 @@ BufferWidget::~BufferWidget() { _chatViewSearchController = 0; } +void BufferWidget::setAutoMarkerLine(const QVariant &v) { + _autoMarkerLine = v.toBool(); +} + AbstractChatView *BufferWidget::createChatView(BufferId id) { ChatView *chatView; chatView = new ChatView(id, this); @@ -126,7 +147,6 @@ void BufferWidget::scrollToHighlight(QGraphicsItem *highlightItem) { } } - void BufferWidget::zoomIn() { ChatView *view = qobject_cast(ui.stackedWidget->currentWidget()); if(view) @@ -160,11 +180,12 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event) { QKeyEvent *keyEvent = static_cast(event); + MultiLineEdit *inputLine = qobject_cast(watched); + if(!inputLine) + return false; + // Intercept copy key presses if(keyEvent == QKeySequence::Copy) { - InputLine *inputLine = qobject_cast(watched); - if(!inputLine) - return false; if(inputLine->hasSelectedText()) return false; ChatView *view = qobject_cast(ui.stackedWidget->currentWidget()); @@ -173,6 +194,10 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event) { return true; } + // We don't want to steal cursor movement keys if the input line is in multiline mode + if(!inputLine->isSingleLine()) + return false; + switch(keyEvent->key()) { case Qt::Key_Up: case Qt::Key_Down: @@ -186,3 +211,55 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event) { return false; } } + +void BufferWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { + ChatView *prevView = qobject_cast(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(ui.stackedWidget->currentWidget()); + if(curView) { + BufferId curBufferId = current.data(NetworkModel::BufferIdRole).value(); + if(curBufferId.isValid()) { + MsgId markerMsgId = Client::networkModel()->markerLineMsgId(curBufferId); + if(markerMsgId == curView->lastMsgId() && markerMsgId == curView->lastVisibleMsgId()) + curView->setMarkerLineVisible(false); + else + curView->setMarkerLineVisible(true); + } + } + + if(prevView && autoMarkerLine()) + setMarkerLine(prevView, false); +} + +void BufferWidget::setMarkerLine(ChatView *view, bool allowGoingBack) { + if(!view) + view = qobject_cast(ui.stackedWidget->currentWidget()); + if(!view) + return; + + ChatLine *lastLine = view->lastVisibleChatLine(); + if(lastLine) { + QModelIndex idx = lastLine->index(); + MsgId msgId = idx.data(MessageModel::MsgIdRole).value(); + + if(!allowGoingBack) { + BufferId bufId = view->scene()->singleBufferId(); + MsgId oldMsgId = Client::markerLine(bufId); + if(oldMsgId.isValid() && msgId <= oldMsgId) + return; + } + view->setMarkerLine(msgId); + } +} + +void BufferWidget::jumpToMarkerLine(ChatView *view, bool requestBacklog) { + if(!view) + view = qobject_cast(ui.stackedWidget->currentWidget()); + if(!view) + return; + + view->jumpToMarkerLine(requestBacklog); +}