X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=2cff583ba76ca26b8a59eebe86154a327e9909bc;hp=ce9189eda3c858bd0b9581a09fec0c55bc9790a1;hb=1e0bc6a99db648fe68a9aab398d18f041bb17b7f;hpb=65c5a05ece190678187f8244b9752db76f45bf00

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index ce9189ed..2cff583b 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -49,16 +49,20 @@ InputWidget::InputWidget(QWidget *parent)
   ui.ownNick->setSizeAdjustPolicy(QComboBox::AdjustToContents);
   ui.ownNick->installEventFilter(new MouseWheelFilter(this));
   ui.inputEdit->installEventFilter(new JumpKeyHandler(this));
+  ui.inputEdit->installEventFilter(this);
 
   ui.inputEdit->setMinHeight(1);
   ui.inputEdit->setMaxHeight(5);
   ui.inputEdit->setMode(MultiLineEdit::MultiLine);
+  ui.inputEdit->setPasteProtectionEnabled(true);
 
   new TabCompleter(ui.inputEdit);
 
   UiStyleSettings fs("Fonts");
+  fs.notify("UseCustomInputWidgetFont", this, SLOT(setUseCustomFont(QVariant)));
   fs.notify("InputWidget", this, SLOT(setCustomFont(QVariant)));
-  setCustomFont(fs.value("InputWidget", QFont()));
+  if(fs.value("UseCustomInputWidgetFont", false).toBool())
+    setCustomFont(fs.value("InputWidget", QFont()));
 
   UiSettings s("InputWidget");
 
@@ -73,8 +77,11 @@ InputWidget::InputWidget(QWidget *parent)
   s.notify("MaxNumLines", this, SLOT(setMaxLines(QVariant)));
   setMaxLines(s.value("MaxNumLines", 5));
 
-  s.notify("EnableScrollBars", this, SLOT(setEnableScrollBars(QVariant)));
-  setEnableScrollBars(s.value("EnableScrollBars", true));
+  s.notify("EnableScrollBars", this, SLOT(setScrollBarsEnabled(QVariant)));
+  setScrollBarsEnabled(s.value("EnableScrollBars", true));
+
+  s.notify("EnableMultiLine", this, SLOT(setMultiLineEnabled(QVariant)));
+  setMultiLineEnabled(s.value("EnableMultiLine", true));
 
   ActionCollection *coll = QtUi::actionCollection();
 
@@ -87,6 +94,14 @@ InputWidget::InputWidget(QWidget *parent)
 InputWidget::~InputWidget() {
 }
 
+void InputWidget::setUseCustomFont(const QVariant &v) {
+  if(v.toBool()) {
+    UiStyleSettings fs("Fonts");
+    setCustomFont(fs.value("InputWidget"));
+  } else
+    setCustomFont(QFont());
+}
+
 void InputWidget::setCustomFont(const QVariant &v) {
   QFont font = v.value<QFont>();
   if(font.family().isEmpty())
@@ -106,40 +121,43 @@ void InputWidget::setMaxLines(const QVariant &v) {
   ui.inputEdit->setMaxHeight(v.toInt());
 }
 
-void InputWidget::setEnableScrollBars(const QVariant &v) {
+void InputWidget::setScrollBarsEnabled(const QVariant &v) {
   ui.inputEdit->setScrollBarsEnabled(v.toBool());
 }
 
+void InputWidget::setMultiLineEnabled(const QVariant &v) {
+  ui.inputEdit->setMode(v.toBool()? MultiLineEdit::MultiLine : MultiLineEdit::SingleLine);
+}
+
 bool InputWidget::eventFilter(QObject *watched, QEvent *event) {
   if(event->type() != QEvent::KeyPress)
     return false;
 
+  QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+
   // keys from BufferView should be sent to (and focus) the input line
   BufferView *view = qobject_cast<BufferView *>(watched);
   if(view) {
-    QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
     if(keyEvent->text().length() == 1 && !(keyEvent->modifiers() & (Qt::ControlModifier ^ Qt::AltModifier)) ) { // normal key press
       QChar c = keyEvent->text().at(0);
       if(c.isLetterOrNumber() || c.isSpace() || c.isPunct() || c.isSymbol()) {
         setFocus();
         QCoreApplication::sendEvent(inputLine(), keyEvent);
         return true;
-      } else
-        return false;
+      }
     }
-  }
-  return false;
-}
-
-void InputWidget::keyPressEvent(QKeyEvent * event) {
-  if(event->matches(QKeySequence::Find)) {
-    QAction *act = GraphicalUi::actionCollection()->action("ToggleSearchBar");
-    if(act) {
-      act->toggle();
-      return;
+    return false;
+  } else if(watched == ui.inputEdit) {
+    if(keyEvent->matches(QKeySequence::Find)) {
+      QAction *act = GraphicalUi::actionCollection()->action("ToggleSearchBar");
+      if(act) {
+        act->toggle();
+        return true;
+      }
     }
+    return false;
   }
-  AbstractItemView::keyPressEvent(event);
+  return false;
 }
 
 void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
@@ -285,7 +303,7 @@ void InputWidget::updateNickSelector() const {
     if(!me->userModes().isEmpty())
       nicks[nickIdx] += QString(" (+%1)").arg(me->userModes());
   }
-      
+
   ui.ownNick->addItems(nicks);
 
   if(me && me->isAway())