X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=9ac555f44cee8bf4a3f6ae5f8c648696fba765a9;hp=6bc304685269f8b0c77760e5bb6b35ca25e2f64d;hb=22b225ba81373362e6d02a88cd3a906e8c394aac;hpb=dcdc88676f6bf6c961c554e1ff0d160082ba0973

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 6bc30468..9ac555f4 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -18,19 +18,22 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QLayout>
+#include <QKeyEvent>
+#include <QScrollBar>
+
+#include "action.h"
+#include "actioncollection.h"
 #include "bufferwidget.h"
 #include "chatview.h"
 #include "chatviewsearchbar.h"
 #include "chatviewsearchcontroller.h"
-#include "settings.h"
 #include "client.h"
-
-#include "action.h"
-#include "actioncollection.h"
+#include "iconloader.h"
+#include "inputline.h"
 #include "qtui.h"
+#include "settings.h"
 
-#include <QLayout>
-#include <QKeyEvent>
 
 BufferWidget::BufferWidget(QWidget *parent)
   : AbstractBufferContainer(parent),
@@ -63,23 +66,23 @@ BufferWidget::BufferWidget(QWidget *parent)
 
   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 *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("Zoom Original"));
+  zoomOriginalChatview->setShortcut(tr("Ctrl+0"));
 }
 
 BufferWidget::~BufferWidget() {
@@ -90,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);
@@ -125,34 +129,60 @@ 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;
 
   QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+
+  // Intercept copy key presses
+  if(keyEvent == QKeySequence::Copy) {
+    InputLine *inputLine = qobject_cast<InputLine *>(watched);
+    if(!inputLine)
+      return false;
+    if(inputLine->hasSelectedText())
+      return false;
+    ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
+    if(view)
+      view->scene()->selectionToClipboard();
+    return true;
+  }
+
   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);
-    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;
   }
 }