Categories in the settings dialog are now clickable

[quassel.git] / src / qtui / bufferwidget.cpp

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 86f791b..1c727e4 100644 (file)
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -29,6 +29,7 @@
 #include "chatviewsearchbar.h"
 #include "chatviewsearchcontroller.h"
 #include "client.h"
+#include "iconloader.h"
 #include "inputline.h"
 #include "qtui.h"
 #include "settings.h"
@@ -68,20 +69,20 @@ BufferWidget::BufferWidget(QWidget *parent)
 
   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 *zoomInChatview = coll->add<Action>("ZoomInChatView", this, SLOT(zoomIn()));
+  zoomInChatview->setText(tr("Zoom In"));
+  zoomInChatview->setIcon(SmallIcon("zoom-in"));
+  zoomInChatview->setShortcut(QKeySequence::ZoomIn);
 
-  Action *zoomOutChatview = coll->add<Action>("ZoomOutChatView");
-  connect(zoomOutChatview, SIGNAL(triggered()), SLOT(zoomOut()));
-  zoomOutChatview->setText(tr("Demagnify Chat View"));
-  zoomOutChatview->setShortcut(tr("Ctrl+-"));
+  Action *zoomOutChatview = coll->add<Action>("ZoomOutChatView", this, SLOT(zoomOut()));
+  zoomOutChatview->setIcon(SmallIcon("zoom-out"));
+  zoomOutChatview->setText(tr("Zoom Out"));
+  zoomOutChatview->setShortcut(QKeySequence::ZoomOut);
 
-  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"));
+  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
 }
 
 BufferWidget::~BufferWidget() {
@@ -92,6 +93,7 @@ BufferWidget::~BufferWidget() {
 AbstractChatView *BufferWidget::createChatView(BufferId id) {
   ChatView *chatView;
   chatView = new ChatView(id, this);
+  chatView->setBufferContainer(this);
   _chatViews[id] = chatView;
   ui.stackedWidget->addWidget(chatView);
   chatView->setFocusProxy(this);
@@ -127,24 +129,32 @@ void BufferWidget::scrollToHighlight(QGraphicsItem *highlightItem) {
 
 void BufferWidget::zoomIn() {
   ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
-  if(!view) return;
-  view->zoomIn();
+  if(view)
+    view->zoomIn();
 }
 
 void BufferWidget::zoomOut() {
   ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
-  if(!view) return;
-  view->zoomOut();
+  if(view)
+    view->zoomOut();
 }
 
-void BufferWidget::zoomNormal() {
+void BufferWidget::zoomOriginal() {
   ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
-  if(!view) return;
-  view->zoomNormal();
+  if(view)
+    view->zoomOriginal();
+}
+
+void BufferWidget::addActionsToMenu(QMenu *menu, const QPointF &pos) {
+  Q_UNUSED(pos);
+  ActionCollection *coll = QtUi::actionCollection();
+  menu->addSeparator();
+  menu->addAction(coll->action("ZoomInChatView"));
+  menu->addAction(coll->action("ZoomOutChatView"));
+  menu->addAction(coll->action("ZoomOriginalChatView"));
 }
 
 bool BufferWidget::eventFilter(QObject *watched, QEvent *event) {
-  Q_UNUSED(watched);
   if(event->type() != QEvent::KeyPress)
     return false;
 
@@ -163,25 +173,16 @@ bool BufferWidget::eventFilter(QObject *watched, QEvent *event) {
     return true;
   }
 
-  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:
+  case Qt::Key_Up:
+  case Qt::Key_Down:
+    if(!(keyEvent->modifiers() & Qt::ShiftModifier))
       return false;
+  case Qt::Key_PageUp:
+  case Qt::Key_PageDown:
+    // static cast to access public qobject::event
+    return static_cast<QObject*>(ui.stackedWidget->currentWidget())->event(event);
+  default:
+    return false;
   }
 }