X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=047759eb032c426efbf47f0d249c852719b62c9b;hp=e771e7d3e02084741c665a82d21c3b19f238f59e;hb=dfc7619dbb46c3ad919d0dbca11358dcddb7177e;hpb=914118e3b22cdd91191aea8568130f831db0cb8d

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index e771e7d3..047759eb 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -26,19 +26,22 @@
 #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);
@@ -50,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();
 
@@ -83,7 +88,14 @@ BufferWidget::BufferWidget(QWidget *parent)
   Action *zoomOriginalChatview = coll->add<Action>("ZoomOriginalChatView", this, SLOT(zoomOriginal()));
   zoomOriginalChatview->setIcon(SmallIcon("zoom-original"));
   zoomOriginalChatview->setText(tr("Actual Size"));
-  //zoomOriginalChatview->setShortcut(tr("Ctrl+0")); // used for RTS switching
+  //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));
+
+  ChatViewSettings s;
+  s.initAndNotify("AutoMarkerLine", this, SLOT(setAutoMarkerLine(QVariant)), true);
 }
 
 BufferWidget::~BufferWidget() {
@@ -91,6 +103,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);
@@ -127,7 +143,6 @@ void BufferWidget::scrollToHighlight(QGraphicsItem *highlightItem) {
   }
 }
 
-
 void BufferWidget::zoomIn() {
   ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
   if(view)
@@ -161,11 +176,12 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event) {
 
   QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
+  MultiLineEdit *inputLine = qobject_cast<MultiLineEdit *>(watched);
+  if(!inputLine)
+    return false;
+
   // Intercept copy key presses
   if(keyEvent == QKeySequence::Copy) {
-    InputLine *inputLine = qobject_cast<InputLine *>(watched);
-    if(!inputLine)
-      return false;
     if(inputLine->hasSelectedText())
       return false;
     ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
@@ -174,6 +190,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:
@@ -187,3 +207,46 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event) {
     return false;
   }
 }
+
+void BufferWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
+  ChatView *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());
+  if(curView) {
+    BufferId curBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
+    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<ChatView *>(ui.stackedWidget->currentWidget());
+  if(!view)
+    return;
+
+  ChatLine *lastLine = view->lastVisibleChatLine();
+  if(lastLine) {
+    QModelIndex idx = lastLine->index();
+    MsgId msgId = idx.data(MessageModel::MsgIdRole).value<MsgId>();
+
+    if(!allowGoingBack) {
+      BufferId bufId = view->scene()->singleBufferId();
+      MsgId oldMsgId = Client::markerLine(bufId);
+      if(oldMsgId.isValid() && msgId <= oldMsgId)
+        return;
+    }
+    view->setMarkerLine(msgId);
+  }
+}