X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=e30ba78671fd0762ff1a94aeecf8ed3280c75477;hp=299ebce0e52551d380f04ec90d91a1a986f391c1;hb=3efffa2c3f687b21c8040e9a7ee3830e8f539abf;hpb=c14a00f37179e49f034dc64b4da0c86b51caed5d

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 299ebce0..e30ba786 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -22,6 +22,7 @@
 
 #include "action.h"
 #include "actioncollection.h"
+#include "bufferview.h"
 #include "client.h"
 #include "iconloader.h"
 #include "ircuser.h"
@@ -29,27 +30,57 @@
 #include "networkmodel.h"
 #include "qtui.h"
 #include "qtuisettings.h"
+#include "tabcompleter.h"
 
 InputWidget::InputWidget(QWidget *parent)
   : AbstractItemView(parent),
     _networkId(0)
 {
   ui.setupUi(this);
-  connect(ui.inputEdit, SIGNAL(sendText(QString)), this, SLOT(sendText(QString)));
   connect(ui.ownNick, SIGNAL(activated(QString)), this, SLOT(changeNick(QString)));
-  connect(this, SIGNAL(userInput(BufferInfo, QString)), Client::instance(), SIGNAL(sendInput(BufferInfo, QString)));
+
+  layout()->setAlignment(ui.ownNick, Qt::AlignBottom);
+  layout()->setAlignment(ui.inputEdit, Qt::AlignBottom);
+
   setFocusProxy(ui.inputEdit);
+  ui.ownNick->setFocusProxy(ui.inputEdit);
 
   ui.ownNick->setSizeAdjustPolicy(QComboBox::AdjustToContents);
   ui.ownNick->installEventFilter(new MouseWheelFilter(this));
   ui.inputEdit->installEventFilter(new JumpKeyHandler(this));
+  ui.inputEdit->installEventFilter(this);
 
-  QtUiStyleSettings s("Fonts");
-  s.notify("InputLine", this, SLOT(setFont(QVariant)));
-  QFont font = s.value("InputLine", QFont()).value<QFont>();
-  if(font.family().isEmpty())
-    font = QApplication::font();
-  setFont(font);
+  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)));
+  if(fs.value("UseCustomInputWidgetFont", false).toBool())
+    setCustomFont(fs.value("InputWidget", QFont()));
+
+  UiSettings s("InputWidget");
+
+#ifdef HAVE_KDE
+  s.notify("EnableSpellCheck", this, SLOT(setEnableSpellCheck(QVariant)));
+  setEnableSpellCheck(s.value("EnableSpellCheck", false));
+#endif
+
+  s.notify("ShowNickSelector", this, SLOT(setShowNickSelector(QVariant)));
+  setShowNickSelector(s.value("ShowNickSelector", true));
+
+  s.notify("MaxNumLines", this, SLOT(setMaxLines(QVariant)));
+  setMaxLines(s.value("MaxNumLines", 5));
+
+  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();
 
@@ -62,11 +93,70 @@ 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())
     font = QApplication::font();
-  ui.inputEdit->setFont(font);
+  ui.inputEdit->setCustomFont(font);
+}
+
+void InputWidget::setEnableSpellCheck(const QVariant &v) {
+  ui.inputEdit->setSpellCheckEnabled(v.toBool());
+}
+
+void InputWidget::setShowNickSelector(const QVariant &v) {
+  ui.ownNick->setVisible(v.toBool());
+}
+
+void InputWidget::setMaxLines(const QVariant &v) {
+  ui.inputEdit->setMaxHeight(v.toInt());
+}
+
+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) {
+    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;
+      }
+    }
+    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;
+  }
+  return false;
 }
 
 void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
@@ -105,7 +195,7 @@ void InputWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int
 
 void InputWidget::updateEnabledState() {
   QModelIndex currentIndex = selectionModel()->currentIndex();
-  
+
   const Network *net = Client::networkModel()->networkByIndex(currentIndex);
   bool enabled = false;
   if(net) {
@@ -158,6 +248,7 @@ void InputWidget::connectMyIrcUser() {
     connect(network->me(), SIGNAL(userModesRemoved(QString)), this, SLOT(updateNickSelector()));
     connect(network->me(), SIGNAL(awaySet(bool)), this, SLOT(updateNickSelector()));
     disconnect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
+    updateNickSelector();
   } else {
     connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
   }
@@ -175,8 +266,9 @@ void InputWidget::setIdentity(IdentityId identityId) {
 
   const Identity *identity = Client::identity(identityId);
   if(identity) {
-    connect(identity, SIGNAL(nicksSet(QStringList)),
-	    this, SLOT(updateNickSelector()));
+    connect(identity, SIGNAL(nicksSet(QStringList)), this, SLOT(updateNickSelector()));
+  } else {
+    _identityId = 0;
   }
   updateNickSelector();
 }
@@ -190,7 +282,7 @@ void InputWidget::updateNickSelector() const {
 
   const Identity *identity = Client::identity(net->identity());
   if(!identity) {
-    qWarning() << "InputWidget::updateNickSelector(): can't find Identity for Network" << net->networkId();
+    qWarning() << "InputWidget::updateNickSelector(): can't find Identity for Network" << net->networkId() << "IdentityId:" << net->identity();
     return;
   }
 
@@ -205,9 +297,12 @@ void InputWidget::updateNickSelector() const {
     return;
 
   IrcUser *me = net->me();
-  if(me)
-    nicks[nickIdx] = net->myNick() + QString(" (+%1)").arg(me->userModes());
-      
+  if(me) {
+    nicks[nickIdx] = net->myNick();
+    if(!me->userModes().isEmpty())
+      nicks[nickIdx] += QString(" (+%1)").arg(me->userModes());
+  }
+
   ui.ownNick->addItems(nicks);
 
   if(me && me->isAway())
@@ -220,11 +315,15 @@ void InputWidget::changeNick(const QString &newNick) const {
   const Network *net = currentNetwork();
   if(!net || net->isMyNick(newNick))
     return;
-  emit userInput(currentBufferInfo(), QString("/nick %1").arg(newNick));
+
+  // we reset the nick selecter as we have no confirmation yet, that this will succeed.
+  // if the action succeeds it will be properly updated anyways.
+  updateNickSelector();
+  Client::userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/NICK %1").arg(newNick));
 }
 
-void InputWidget::sendText(QString text) {
-  emit userInput(currentBufferInfo(), text);
+void InputWidget::on_inputEdit_textEntered(const QString &text) const {
+  Client::userInput(currentBufferInfo(), text);
 }