X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuisupport%2Finputline.cpp;h=53bcdcacd2c5c156456eb0d69a3c155635eb5108;hb=dcac65fc4beeb1167de8ebec5cc54608fc314fd3;hp=b48c053d5e22bb695ef5c6b8959cd7c21e246137;hpb=ee9eb6726ae65a85fbb5e98e65d038d410580146;p=quassel.git diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp index b48c053d..53bcdcac 100644 --- a/src/uisupport/inputline.cpp +++ b/src/uisupport/inputline.cpp @@ -18,8 +18,9 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "inputline.h" +#include "bufferview.h" +#include "inputline.h" #include "tabcompleter.h" InputLine::InputLine(QWidget *parent) @@ -34,25 +35,46 @@ InputLine::InputLine(QWidget *parent) InputLine::~InputLine() { } +bool InputLine::eventFilter(QObject *watched, QEvent *event) { + if(event->type() != QEvent::KeyPress) + return false; + + // keys from BufferView should be sent to (and focus) the input line + BufferView *view = qobject_cast(watched); + if(view) { + QKeyEvent *keyEvent = static_cast(event); + if(keyEvent->text().length() == 1) { // normal key press + QChar c = keyEvent->text().at(0); + if(c.isLetterOrNumber() || c.isSpace() || c.isPunct() || c.isSymbol()) { + setFocus(); + keyPressEvent(keyEvent); + return true; + } else + return false; + } + } + return false; +} + void InputLine::keyPressEvent(QKeyEvent * event) { switch(event->key()) { case Qt::Key_Up: event->accept(); addToHistory(text(), true); - + if(idx > 0) { idx--; showHistoryEntry(); } break; - + case Qt::Key_Down: event->accept(); addToHistory(text(), true); - + if(idx < history.count()) { idx++; if(idx < history.count() || tempHistory.contains(idx)) // tempHistory might have an entry for idx == history.count() + 1 @@ -65,7 +87,7 @@ void InputLine::keyPressEvent(QKeyEvent * event) { } break; - + case Qt::Key_Select: // for Qtopia emit returnPressed(); @@ -79,7 +101,7 @@ bool InputLine::addToHistory(const QString &text, bool temporary) { return false; Q_ASSERT(0 <= idx && idx <= history.count()); - + if(history.isEmpty() || text != history[idx - (int)(idx == history.count())]) { // if an entry of the history is changed, we remember it and show it again at this // position until a line was actually sent @@ -103,30 +125,55 @@ void InputLine::on_returnPressed() { } void InputLine::on_textChanged(QString newText) { - QStringList lineSeperators; - lineSeperators << QString("\r\n") + QStringList lineSeparators; + lineSeparators << QString("\r\n") << QString('\n') << QString('\r'); - + QString lineSep; - foreach(QString seperator, lineSeperators) { - if(newText.contains(seperator)) { - lineSep = seperator; + foreach(QString separator, lineSeparators) { + if(newText.contains(separator)) { + lineSep = separator; break; } } if(lineSep.isEmpty()) return; - - if(newText.contains(lineSep)) { + + QStringList lines = newText.split(lineSep); + clear(); + + if(lines.count() > 4) { + QString msg = tr("Do you really want to paste %1 lines?").arg(lines.count()); + msg += "

"; + for(int i = 0; i < 3; i++) { + msg += lines[i].left(40); + if(lines[i].count() > 40) + msg += "..."; + msg += "
"; + } + msg += "...

"; + QMessageBox question(QMessageBox::NoIcon, tr("Paste Protection"), msg, QMessageBox::Yes|QMessageBox::No); + question.setDefaultButton(QMessageBox::No); + question.setWindowFlags(question.windowFlags() | Qt::Sheet); + if(question.exec() == QMessageBox::No) + return; + } + + foreach(QString line, lines) { clear(); - QString line = newText.section(lineSep, 0, 0); - QString remainder = newText.section(lineSep, 1); insert(line); emit returnPressed(); - insert(remainder); } +// if(newText.contains(lineSep)) { +// clear(); +// QString line = newText.section(lineSep, 0, 0); +// QString remainder = newText.section(lineSep, 1); +// insert(line); +// emit returnPressed(); +// insert(remainder); +// } } void InputLine::resetLine() {