X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=7b4e9545dcc772fef0474260694dbac0c43a8c79;hp=bfda813323a763644a6dbb95d05383a41e830429;hb=83efa7dcd9771008e7600b4c35db0dde6e0bc995;hpb=96ba1da0cfa2a22be6fe8cea8d32a7212dcfa86a diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp index bfda8133..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 * @@ -18,24 +18,30 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#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 "settings.h" +#include "chatviewsettings.h" #include "client.h" - -#include "action.h" -#include "actioncollection.h" +#include "iconloader.h" +#include "multilineedit.h" #include "qtui.h" +#include "settings.h" -#include -#include -#include 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); @@ -47,40 +53,53 @@ 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(); - Action *zoomChatview = coll->add("ZoomChatView"); - connect(zoomChatview, SIGNAL(triggered()), SLOT(zoomIn())); - zoomChatview->setText(tr("Enlarge Chat View")); - zoomChatview->setShortcut(tr("Ctrl++")); + Action *zoomInChatview = coll->add("ZoomInChatView", this, SLOT(zoomIn())); + zoomInChatview->setText(tr("Zoom In")); + zoomInChatview->setIcon(SmallIcon("zoom-in")); + zoomInChatview->setShortcut(QKeySequence::ZoomIn); + + Action *zoomOutChatview = coll->add("ZoomOutChatView", this, SLOT(zoomOut())); + zoomOutChatview->setIcon(SmallIcon("zoom-out")); + zoomOutChatview->setText(tr("Zoom Out")); + zoomOutChatview->setShortcut(QKeySequence::ZoomOut); + + Action *zoomOriginalChatview = coll->add("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("SetMarkerLineToBottom", this, SLOT(setMarkerLine())); + setMarkerLine->setText(tr("Set Marker Line")); + setMarkerLine->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R)); - Action *zoomOutChatview = coll->add("ZoomOutChatView"); - connect(zoomOutChatview, SIGNAL(triggered()), SLOT(zoomOut())); - zoomOutChatview->setText(tr("Demagnify Chat View")); - zoomOutChatview->setShortcut(tr("Ctrl+-")); + 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)); - Action *zoomNormalChatview = coll->add("ZoomNormalChatView"); - connect(zoomNormalChatview, SIGNAL(triggered()), SLOT(zoomNormal())); - zoomNormalChatview->setText(tr("Normalize zoom of Chat View")); - zoomNormalChatview->setShortcut(tr("Ctrl+0")); + ChatViewSettings s; + s.initAndNotify("AutoMarkerLine", this, SLOT(setAutoMarkerLine(QVariant)), true); } BufferWidget::~BufferWidget() { @@ -88,9 +107,14 @@ 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); + chatView->setBufferContainer(this); _chatViews[id] = chatView; ui.stackedWidget->addWidget(chatView); chatView->setFocusProxy(this); @@ -123,50 +147,119 @@ void BufferWidget::scrollToHighlight(QGraphicsItem *highlightItem) { } } - void BufferWidget::zoomIn() { ChatView *view = qobject_cast(ui.stackedWidget->currentWidget()); - if(!view) return; - view->zoomIn(); + if(view) + view->zoomIn(); } void BufferWidget::zoomOut() { ChatView *view = qobject_cast(ui.stackedWidget->currentWidget()); - if(!view) return; - view->zoomOut(); + if(view) + view->zoomOut(); } -void BufferWidget::zoomNormal() { +void BufferWidget::zoomOriginal() { ChatView *view = qobject_cast(ui.stackedWidget->currentWidget()); - if(!view) return; - view->zoomNormal(); + if(view) + view->zoomOriginal(); +} + +void BufferWidget::addActionsToMenu(QMenu *menu, const QPointF &pos) { + Q_UNUSED(pos); + 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) { - Q_UNUSED(watched); if(event->type() != QEvent::KeyPress) return false; QKeyEvent *keyEvent = static_cast(event); - int direction = 1; + MultiLineEdit *inputLine = qobject_cast(watched); + if(!inputLine) + return false; + + // Intercept copy key presses + if(keyEvent == QKeySequence::Copy) { + if(inputLine->hasSelectedText()) + return false; + ChatView *view = qobject_cast(ui.stackedWidget->currentWidget()); + if(view) + view->scene()->selectionToClipboard(); + 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_PageUp: - case Qt::Key_PageDown: - // static cast to access public qobject::event - return static_cast(ui.stackedWidget->currentWidget())->event(event); - - case Qt::Key_Up: - direction = -1; - case Qt::Key_Down: - if(keyEvent->modifiers() == Qt::ShiftModifier) { - QAbstractScrollArea *scrollArea = qobject_cast(ui.stackedWidget->currentWidget()); - if(!scrollArea) - return false; - int sliderPosition = scrollArea->verticalScrollBar()->value(); - scrollArea->verticalScrollBar()->setValue(sliderPosition + (direction * 12)); - } - default: + case Qt::Key_Up: + case Qt::Key_Down: + if(!(keyEvent->modifiers() & Qt::ShiftModifier)) return false; + case Qt::Key_PageUp: + case Qt::Key_PageDown: + // static cast to access public qobject::event + return static_cast(ui.stackedWidget->currentWidget())->event(event); + default: + 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); +}