X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=f9b698672c9eff48f24b094998c19efdc01dc658;hp=cf6ae8301b3878e8ae03557fbd4a470ea3aa0cab;hb=8a4544df5632a46407697b6b3f172d75037ae25b;hpb=50706d89d4d60e258ebb6873d3778383621898e4

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index cf6ae830..f9b69867 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -19,93 +19,83 @@
  ***************************************************************************/
 
 #include "bufferwidget.h"
-#include "buffer.h"
-#include "chatline-old.h"
-#include "chatwidget.h"
+#include "chatview.h"
+#include "chatviewsearchbar.h"
+#include "chatviewsearchcontroller.h"
 #include "settings.h"
 #include "client.h"
 
+#include <QLayout>
+
 BufferWidget::BufferWidget(QWidget *parent)
-  : QWidget(parent),
-    _currentBuffer(0)
+  : AbstractBufferContainer(parent),
+    _chatViewSearchController(new ChatViewSearchController(this))
 {
   ui.setupUi(this);
-  ui.ownNick->clear();  // TODO add nick history
-  connect(ui.inputEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
+  layout()->setContentsMargins(0, 0, 0, 0);
+  layout()->setSpacing(0);
+  // ui.searchBar->hide();
+
+  _chatViewSearchController->setCaseSensitive(ui.searchBar->caseSensitiveBox()->isChecked());
+  _chatViewSearchController->setSearchSenders(ui.searchBar->searchSendersBox()->isChecked());
+  _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->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(_chatViewSearchController, SIGNAL(newCurrentHighlight(QGraphicsItem *)),
+	  this, SLOT(scrollToHighlight(QGraphicsItem *)));
 }
 
-void BufferWidget::init() {
-
+BufferWidget::~BufferWidget() {
+  delete _chatViewSearchController;
+  _chatViewSearchController = 0;
 }
 
-BufferWidget::~BufferWidget() {
+AbstractChatView *BufferWidget::createChatView(BufferId id) {
+  ChatView *chatView;
+  chatView = new ChatView(id, this);
+  _chatViews[id] = chatView;
+  ui.stackedWidget->addWidget(chatView);
+  chatView->setFocusProxy(this);
+  return chatView;
 }
 
-BufferId BufferWidget::currentBuffer() const {
-  return _currentBuffer;
+void BufferWidget::removeChatView(BufferId id) {
+  QWidget *view = _chatViews.value(id, 0);
+  if(!view) return;
+  ui.stackedWidget->removeWidget(view);
+  view->deleteLater();
+  _chatViews.take(id);
 }
 
-void BufferWidget::setCurrentBuffer(BufferId bufferId) {
-  ChatWidget *chatWidget;
-  if(_chatWidgets.contains(bufferId)) {
-     chatWidget = _chatWidgets[bufferId];
+void BufferWidget::showChatView(BufferId id) {
+  if(!id.isValid()) {
+    ui.stackedWidget->setCurrentWidget(ui.page);
   } else {
-    Buffer *buf = Client::buffer(bufferId);
-    if(!buf) {
-      qWarning() << "BufferWidget::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId;
-      return;
-    }
-    chatWidget = new ChatWidget(this);
-    chatWidget->init(bufferId);
-    QList<ChatLine *> lines;
-    QList<AbstractUiMsg *> msgs = buf->contents();
-    foreach(AbstractUiMsg *msg, msgs) {
-      lines.append(dynamic_cast<ChatLine*>(msg));
-    }
-    chatWidget->setContents(lines);
-    connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *)));
-    connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatWidget, SLOT(prependMsg(AbstractUiMsg *)));
-    _chatWidgets[bufferId] = chatWidget;
-    ui.stackedWidget->addWidget(chatWidget);
+    ChatView *view = qobject_cast<ChatView *>(_chatViews.value(id));
+    Q_ASSERT(view);
+    ui.stackedWidget->setCurrentWidget(view);
+    _chatViewSearchController->setScene(view->scene());
   }
-  ui.stackedWidget->setCurrentWidget(chatWidget);
-  disconnect(this, SIGNAL(userInput(QString)), 0, 0);
-  connect(this, SIGNAL(userInput(QString)), Client::buffer(bufferId), SLOT(processUserInput(QString)));
-  chatWidget->setFocusProxy(ui.inputEdit);
-  ui.inputEdit->setFocus();
-
 }
 
-void BufferWidget::removeBuffer(BufferId bufferId) {
-  if(!_chatWidgets.contains(bufferId))
-    return;
-
-  ChatWidget *chatWidget = _chatWidgets.take(bufferId);
-  ui.stackedWidget->removeWidget(chatWidget);
-  chatWidget->deleteLater();
-}
-
-void BufferWidget::saveState() {
-}
-
-QSize BufferWidget::sizeHint() const {
-  return QSize(800,400);
-}
-
-void BufferWidget::enterPressed() {
-  QStringList lines = ui.inputEdit->text().split('\n', QString::SkipEmptyParts);
-  foreach(QString msg, lines) {
-    if(msg.isEmpty()) continue;
-    emit userInput(msg);
+void BufferWidget::scrollToHighlight(QGraphicsItem *highlightItem) {
+  ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+  if(view) {
+    view->centerOn(highlightItem);
   }
-  ui.inputEdit->clear();
-}
-
-
-
-/*
-void BufferWidget::displayMsg(Message msg) {
-  chatWidget->appendMsg(msg);
 }
-*/
-