X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Finputline.cpp;h=31ec3991e29fed8731fd8958238e4e8e1d48ae1a;hp=535b3c279d350e4341c808e023a6baf26d7e6fce;hb=aa40491595ffec54ba340a9850d99dc14d920eb3;hpb=5df99c1ab83baf3a6caef7e49177f84bd48d127e

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index 535b3c27..31ec3991 100644
--- a/src/uisupport/inputline.cpp
+++ b/src/uisupport/inputline.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by The Quassel Team                             *
+ *   Copyright (C) 2005/06 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -22,51 +22,68 @@
 
 #include "tabcompleter.h"
 
-InputLine::InputLine(QWidget *parent) : QLineEdit(parent) {
-  idx = 0;
-  connect(this, SIGNAL(returnPressed()), this, SLOT(enter()));
-  tabComplete = new TabCompleter(this);
-  connect(this, SIGNAL(nickListUpdated(QStringList)), tabComplete, SLOT(updateNickList(QStringList)));
+InputLine::InputLine(QWidget *parent)
+  : QLineEdit(parent),
+    idx(0),
+    tabCompleter(new TabCompleter(this))
+{
+  connect(this, SIGNAL(returnPressed()), this, SLOT(on_returnPressed()));
+  connect(this, SIGNAL(textChanged(QString)), this, SLOT(on_textChanged(QString)));
 }
 
 InputLine::~InputLine() {
-  delete tabComplete;
 }
 
 void InputLine::keyPressEvent(QKeyEvent * event) {
-  if(event->key() == Qt::Key_Tab) { // Tabcomplete
-    tabComplete->complete();
+  if(event->key() == Qt::Key_Up) {
+    if(idx > 0) { idx--; setText(history[idx]); }
     event->accept();
+  } else if(event->key() == Qt::Key_Down) {
+    if(idx < history.count()) idx++;
+    if(idx < history.count()) setText(history[idx]);
+    else setText("");
+    event->accept();
+  } else if(event->key() == Qt::Key_Select) {  // for Qtopia
+    emit returnPressed();
+    QLineEdit::keyPressEvent(event);
   } else {
-    tabComplete->disable();
-    if(event->key() == Qt::Key_Up) {
-      if(idx > 0) { idx--; setText(history[idx]); }
-      event->accept();
-    } else if(event->key() == Qt::Key_Down) {
-      if(idx < history.count()) idx++;
-      if(idx < history.count()) setText(history[idx]);
-      else setText("");
-      event->accept();
-    } else {
-      QLineEdit::keyPressEvent(event);
-    }
+    QLineEdit::keyPressEvent(event);
   }
-}
 
-bool InputLine::event(QEvent *e) {
-  if(e->type() == QEvent::KeyPress) {
-    keyPressEvent(dynamic_cast<QKeyEvent*>(e));
-    return true;
-  }
-  return QLineEdit::event(e);
 }
 
-void InputLine::enter() {
+void InputLine::on_returnPressed() {
   history << text();
   idx = history.count();
+  emit sendText(text());
+  clear();
 }
 
-void InputLine::updateNickList(QStringList l) {
-  nickList = l;
-  emit nickListUpdated(l);
+void InputLine::on_textChanged(QString newText) {
+  QStringList lineSeperators;
+  lineSeperators << QString("\r\n")
+		 << QString('\n')
+		 << QString('\r');
+  
+  QString lineSep;
+  foreach(QString seperator, lineSeperators) {
+    if(newText.contains(seperator)) {
+      lineSep = seperator;
+      break;
+    }
+  }
+
+  if(lineSep.isEmpty())
+    return;
+  
+  if(newText.contains(lineSep)) {
+    clear();
+    QString line = newText.section(lineSep, 0, 0);
+    QString remainder = newText.section(lineSep, 1);
+    insert(line);
+    emit returnPressed();
+    insert(remainder);
+  }
+  
 }
+