Move ActionCollection handling from QtUi to GraphicalUi

[quassel.git] / src / uisupport / inputline.cpp

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index eaf1212..a46bed4 100644 (file)
--- a/src/uisupport/inputline.cpp
+++ b/src/uisupport/inputline.cpp
@@ -35,9 +35,12 @@ InputLine::InputLine(QWidget *parent)
 {
 #ifdef HAVE_KDE
 //This is done to make the KTextEdit look like a lineedit
-  setMaximumHeight(document()->size().toSize().height());
+  setMaximumHeight(document()->size().toSize().height() + 2);
   setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setAcceptRichText(false);
+  setLineWrapMode(NoWrap);
+  enableFindReplace(false);
+  setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
 #endif
 
@@ -103,11 +106,15 @@ void InputLine::keyPressEvent(QKeyEvent * event) {
 
   case Qt::Key_Select:         // for Qtopia
     emit returnPressed();
+    break;
 
 #ifdef HAVE_KDE
 //Since this is a ktextedit, we don't have this signal "natively"
   case Qt::Key_Return:
+    event->accept();
     emit returnPressed();
+    break;
+
 #endif
 
   default: