/***************************************************************************
- * 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 *
#include <QLayout>
#include <QKeyEvent>
+#include <QMenu>
#include <QScrollBar>
#include "action.h"
#include "chatviewsearchcontroller.h"
#include "client.h"
#include "iconloader.h"
-#include "inputline.h"
+#include "multilineedit.h"
#include "qtui.h"
#include "settings.h"
_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, SIGNAL(searchChanged(const QString &)),
+ _chatViewSearchController, SLOT(setSearchString(const QString &)));
connect(ui.searchBar->caseSensitiveBox(), SIGNAL(toggled(bool)),
- _chatViewSearchController, SLOT(setCaseSensitive(bool)));
+ _chatViewSearchController, SLOT(setCaseSensitive(bool)));
connect(ui.searchBar->searchSendersBox(), SIGNAL(toggled(bool)),
- _chatViewSearchController, SLOT(setSearchSenders(bool)));
+ _chatViewSearchController, SLOT(setSearchSenders(bool)));
connect(ui.searchBar->searchMsgsBox(), SIGNAL(toggled(bool)),
- _chatViewSearchController, SLOT(setSearchMsgs(bool)));
+ _chatViewSearchController, SLOT(setSearchMsgs(bool)));
connect(ui.searchBar->searchOnlyRegularMsgsBox(), SIGNAL(toggled(bool)),
- _chatViewSearchController, SLOT(setSearchOnlyRegularMsgs(bool)));
+ _chatViewSearchController, SLOT(setSearchOnlyRegularMsgs(bool)));
connect(ui.searchBar->searchUpButton(), SIGNAL(clicked()),
- _chatViewSearchController, SLOT(highlightPrev()));
+ _chatViewSearchController, SLOT(highlightPrev()));
connect(ui.searchBar->searchDownButton(), SIGNAL(clicked()),
- _chatViewSearchController, SLOT(highlightNext()));
+ _chatViewSearchController, SLOT(highlightNext()));
+
+ connect(ui.searchBar, SIGNAL(hidden()), this, SLOT(setFocus()));
connect(_chatViewSearchController, SIGNAL(newCurrentHighlight(QGraphicsItem *)),
- this, SLOT(scrollToHighlight(QGraphicsItem *)));
+ this, SLOT(scrollToHighlight(QGraphicsItem *)));
ActionCollection *coll = QtUi::actionCollection();
Action *zoomOriginalChatview = coll->add<Action>("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() {
view->zoomOriginal();
}
-void BufferWidget::addActionsToMenu(QMenu *menu) {
+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) {
QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+ MultiLineEdit *inputLine = qobject_cast<MultiLineEdit *>(watched);
+ if(!inputLine)
+ return false;
+
// 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());
return true;
}
- int direction = 1;
+ // We don't want to steal cursor movement keys if the input line is in multiline mode
+ if(!inputLine->isSingleLine())
+ return false;
+
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;
}
}