X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Finputline.cpp;h=03087fb610540c461a057bbbac7f01e5568f0194;hp=593af037b9d3a29b81985ed47e360e46ad90f947;hb=758d3568fe1a9cd08bd6c62c87ac3ac2c48f2f4d;hpb=c3300ca8b3ff0fd9ce8deb4fd0590514f1101b73

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index 593af037..03087fb6 100644
--- a/src/uisupport/inputline.cpp
+++ b/src/uisupport/inputline.cpp
@@ -130,15 +130,9 @@ void InputLine::keyPressEvent(QKeyEvent * event) {
 #ifdef HAVE_KDE
 //Since this is a ktextedit, we don't have this signal "natively"
   case Qt::Key_Return:
-    event->accept();
-    if(!text().isEmpty())
-      emit returnPressed();
-    break;
-
   case Qt::Key_Enter:
     event->accept();
-    if(!text().isEmpty())
-      emit returnPressed();
+    emit returnPressed();
     break;
 
 #endif
@@ -175,9 +169,11 @@ bool InputLine::addToHistory(const QString &text, bool temporary) {
 }
 
 void InputLine::on_returnPressed() {
-  addToHistory(text());
-  emit sendText(text());
-  resetLine();
+  if(!text().isEmpty()) {
+    addToHistory(text());
+    emit sendText(text());
+    resetLine();
+  }
 }
 
 void InputLine::on_textChanged(QString newText) {
@@ -245,4 +241,9 @@ void InputLine::resetLine() {
 void InputLine::showHistoryEntry() {
   // if the user changed the history, display the changed line
   tempHistory.contains(idx) ? setText(tempHistory[idx]) : setText(history[idx]);
+#ifdef HAVE_KDE
+  QTextCursor cursor = textCursor();
+  cursor.movePosition(QTextCursor::End);
+  setTextCursor(cursor);
+#endif
 }