X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=f9b698672c9eff48f24b094998c19efdc01dc658;hp=a18a18c9b81df8eb6bf6e7c8cdb64afc1261ec17;hb=1eb21546673535f5707aa6346e8c749b928cd772;hpb=533eaaeda64759c01daa624365b8fc63eeba5ccf

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index a18a18c9..f9b69867 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -20,22 +20,57 @@
 
 #include "bufferwidget.h"
 #include "chatview.h"
+#include "chatviewsearchbar.h"
+#include "chatviewsearchcontroller.h"
 #include "settings.h"
 #include "client.h"
 
-#include "global.h"
+#include <QLayout>
 
-BufferWidget::BufferWidget(QWidget *parent) : AbstractBufferContainer(parent) {
+BufferWidget::BufferWidget(QWidget *parent)
+  : AbstractBufferContainer(parent),
+    _chatViewSearchController(new ChatViewSearchController(this))
+{
   ui.setupUi(this);
+  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 *)));
+}
+
+BufferWidget::~BufferWidget() {
+  delete _chatViewSearchController;
+  _chatViewSearchController = 0;
 }
 
 AbstractChatView *BufferWidget::createChatView(BufferId id) {
   ChatView *chatView;
-  chatView = new ChatView(Client::buffer(id), this);
+  chatView = new ChatView(id, this);
   _chatViews[id] = chatView;
   ui.stackedWidget->addWidget(chatView);
   chatView->setFocusProxy(this);
-  chatView->setBufferForBacklogFetching(id);
   return chatView;
 }
 
@@ -48,7 +83,19 @@ void BufferWidget::removeChatView(BufferId id) {
 }
 
 void BufferWidget::showChatView(BufferId id) {
-  if(!id.isValid()) ui.stackedWidget->setCurrentWidget(ui.page);
-  else ui.stackedWidget->setCurrentWidget(_chatViews.value(id));
+  if(!id.isValid()) {
+    ui.stackedWidget->setCurrentWidget(ui.page);
+  } else {
+    ChatView *view = qobject_cast<ChatView *>(_chatViews.value(id));
+    Q_ASSERT(view);
+    ui.stackedWidget->setCurrentWidget(view);
+    _chatViewSearchController->setScene(view->scene());
+  }
 }
 
+void BufferWidget::scrollToHighlight(QGraphicsItem *highlightItem) {
+  ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+  if(view) {
+    view->centerOn(highlightItem);
+  }
+}