X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=1c727e42a0706637b47ea453a08cae84710610e1;hb=5916720e01ef3473e06e9134507a6099c2466198;hp=69718d526b20eacf4071571e0c7e3708824bcd47;hpb=16e4a21c1292448c1a524010d70f6e59b84802f4;p=quassel.git diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp index 69718d52..1c727e42 100644 --- 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 * @@ -81,8 +81,8 @@ BufferWidget::BufferWidget(QWidget *parent) Action *zoomOriginalChatview = coll->add("ZoomOriginalChatView", this, SLOT(zoomOriginal())); zoomOriginalChatview->setIcon(SmallIcon("zoom-original")); - zoomOriginalChatview->setText(tr("Zoom Original")); - zoomOriginalChatview->setShortcut(tr("Ctrl+0")); + zoomOriginalChatview->setText(tr("Actual Size")); + //zoomOriginalChatview->setShortcut(tr("Ctrl+0")); // used for RTS switching } BufferWidget::~BufferWidget() { @@ -173,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(ui.stackedWidget->currentWidget())->event(event); - - case Qt::Key_Up: - direction = -1; - case Qt::Key_Down: - if(keyEvent->modifiers() == Qt::ShiftModifier) { - QAbstractScrollArea *scrollArea = qobject_cast(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(ui.stackedWidget->currentWidget())->event(event); + default: + return false; } }