X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=e16735e53ea45da58158184c7511f150107e9aa9;hb=7ddbb98e280034b3bd42f568919e0c6cc5b5e06e;hp=0acb5bebd8bd316c66eb0ceabc01fe880f56564b;hpb=f3fc0324c8860dff6af722dafbeb05fcb69a0c41;p=quassel.git

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 0acb5beb..e16735e5 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -19,37 +19,54 @@
  ***************************************************************************/
 
 #include "bufferwidget.h"
-#ifdef SPUTDEV
-# include "chatline.h"
-#else
-# include "chatline-old.h"
-#endif
 #include "chatview.h"
-#include "chatwidget.h"
+#include "chatviewsearchbar.h"
+#include "chatviewsearchcontroller.h"
 #include "settings.h"
 #include "client.h"
 
 #include "global.h"
 
-BufferWidget::BufferWidget(QWidget *parent) : AbstractBufferContainer(parent) {
+#include <QLayout>
+
+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)));
 }
 
 BufferWidget::~BufferWidget() {
-
+  delete _chatViewSearchController;
+  _chatViewSearchController = 0;
 }
 
 AbstractChatView *BufferWidget::createChatView(BufferId id) {
-  QWidget *chatView;
-#ifdef SPUTDEV
-  chatView = new ChatView(Client::buffer(id), this);
-#else
-  chatView = new ChatWidget(id, this);
-#endif
+  ChatView *chatView;
+  chatView = new ChatView(id, this);
   _chatViews[id] = chatView;
   ui.stackedWidget->addWidget(chatView);
   chatView->setFocusProxy(this);
-  return dynamic_cast<AbstractChatView*>(chatView);
+  return chatView;
 }
 
 void BufferWidget::removeChatView(BufferId id) {
@@ -61,7 +78,13 @@ 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());
+  }
 }