X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=6fc0287dcd31acffdb2573ab1502500e42a86d75;hp=a0f71c6c5340c5e9bfedb558f13bd3c424e861e0;hb=5cc01948319761863c121a74dc1e7b1c182beaa6;hpb=a117d3bd1592bae3b14630c953790a005b3c3a3d

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index a0f71c6c..6fc0287d 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -25,9 +25,13 @@
 #include "settings.h"
 #include "client.h"
 
-#include "global.h"
+#include "action.h"
+#include "actioncollection.h"
+#include "qtui.h"
 
 #include <QLayout>
+#include <QKeyEvent>
+#include <QScrollBar>
 
 BufferWidget::BufferWidget(QWidget *parent)
   : AbstractBufferContainer(parent),
@@ -42,7 +46,7 @@ BufferWidget::BufferWidget(QWidget *parent)
   _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)),
@@ -53,6 +57,30 @@ BufferWidget::BufferWidget(QWidget *parent)
 	  _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 *)));
+  
+  ActionCollection *coll = QtUi::actionCollection();
+
+  Action *zoomChatview = coll->add<Action>("ZoomChatView");
+  connect(zoomChatview, SIGNAL(triggered()), SLOT(zoomIn()));
+  zoomChatview->setText(tr("Enlarge Chat View"));
+  zoomChatview->setShortcut(tr("Ctrl++"));
+
+  Action *zoomOutChatview = coll->add<Action>("ZoomOutChatView");
+  connect(zoomOutChatview, SIGNAL(triggered()), SLOT(zoomOut()));
+  zoomOutChatview->setText(tr("Demagnify Chat View"));
+  zoomOutChatview->setShortcut(tr("Ctrl+-"));
+
+  Action *zoomNormalChatview = coll->add<Action>("ZoomNormalChatView");
+  connect(zoomNormalChatview, SIGNAL(triggered()), SLOT(zoomNormal()));
+  zoomNormalChatview->setText(tr("Normalize zoom of Chat View"));
+  zoomNormalChatview->setShortcut(tr("Ctrl+0"));
 }
 
 BufferWidget::~BufferWidget() {
@@ -66,7 +94,6 @@ AbstractChatView *BufferWidget::createChatView(BufferId id) {
   _chatViews[id] = chatView;
   ui.stackedWidget->addWidget(chatView);
   chatView->setFocusProxy(this);
-  chatView->setBufferForBacklogFetching(id);
   return chatView;
 }
 
@@ -89,3 +116,58 @@ void BufferWidget::showChatView(BufferId id) {
   }
 }
 
+void BufferWidget::scrollToHighlight(QGraphicsItem *highlightItem) {
+  ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+  if(view) {
+    view->centerOn(highlightItem);
+  }
+}
+
+
+void BufferWidget::zoomIn() {
+  ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+  if(!view) return;
+  view->zoomIn();
+}
+
+void BufferWidget::zoomOut() {
+  ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+  if(!view) return;
+  view->zoomOut();
+}
+
+void BufferWidget::zoomNormal() {
+  ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+  if(!view) return;
+  view->zoomNormal();
+}
+
+bool BufferWidget::eventFilter(QObject *watched, QEvent *event) {
+  Q_UNUSED(watched);
+  if(event->type() != QEvent::KeyPress)
+    return false;
+
+  QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+
+  int direction = 1;
+  switch(keyEvent->key()) {
+    case Qt::Key_PageUp:
+    case Qt::Key_PageDown:
+      // static cast to access public qobject::event
+      return static_cast<QObject*>(ui.stackedWidget->currentWidget())->event(event);
+
+    case Qt::Key_Up:
+      direction = -1;
+    case Qt::Key_Down:
+      if(keyEvent->modifiers() == Qt::ShiftModifier) {
+        QAbstractScrollArea *scrollArea = qobject_cast<QAbstractScrollArea*>(ui.stackedWidget->currentWidget());
+        if(!scrollArea)
+          return false;
+        int sliderPosition = scrollArea->verticalScrollBar()->value();
+        scrollArea->verticalScrollBar()->setValue(sliderPosition + (direction * 12));
+        return true;
+      }
+    default:
+      return false;
+  }
+}