X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=0745d66659a7920d79cbe31a05c86e97064b758e;hb=1f02b7201ab7b86238e705d2ce5b22f50bf6acfe;hp=c10862876bf804c887f96ad23dfc1991dc5589fc;hpb=bf9530ddf0b227b6737e9cc672d40a703516c7ea;p=quassel.git

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index c1086287..0745d666 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -22,8 +22,7 @@
 
 #include "client.h"
 #include "networkmodel.h"
-#include "network.h"
-#include "identity.h"
+#include "jumpkeyhandler.h"
 
 InputWidget::InputWidget(QWidget *parent)
   : QWidget(parent),
@@ -32,10 +31,12 @@ InputWidget::InputWidget(QWidget *parent)
     _selectionModel(0)
 {
   ui.setupUi(this);
-  connect(ui.inputEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
+  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)));
   setFocusProxy(ui.inputEdit);
+
+  ui.inputEdit->installEventFilter(new JumpKeyHandler(this));  
 }
 
 InputWidget::~InputWidget() {
@@ -68,17 +69,56 @@ void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &
     return;
 
   currentBufferInfo  = current.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+  setNetwork(Client::networkModel()->networkByIndex(current));
   updateNickSelector();
+  ui.inputEdit->setEnabled(current.data(NetworkModel::ItemActiveRole).value<bool>());
 }
 
 const Network *InputWidget::currentNetwork() const {
   if(!validBuffer)
     return 0;
 
-  return Client::network(currentBufferInfo.networkId());
+  return Client::network(_networkId);
+}
+
+void InputWidget::setNetwork(const Network *network) {
+  if(_networkId == network->networkId())
+    return;
+
+  const Network *previousNet = Client::network(_networkId);
+  if(previousNet)
+    disconnect(previousNet, 0, this, 0);
+
+  if(network) {
+    _networkId = network->networkId();
+    connect(network, SIGNAL(myNickSet(QString)),
+	    this, SLOT(updateNickSelector()));
+    connect(network, SIGNAL(identitySet(IdentityId)),
+	    this, SLOT(setIdentity(IdentityId)));
+  }
+  setIdentity(network->identity());
+}
+
+void InputWidget::setIdentity(const IdentityId &identityId) {
+  if(_identityId == identityId)
+    return;
+
+  const Identity *previousIdentity = Client::identity(_identityId);
+  if(previousIdentity)
+    disconnect(previousIdentity, 0, this, 0);
+
+  const Identity *identity = Client::identity(identityId);
+  if(identity) {
+    _identityId = identityId;
+    connect(identity, SIGNAL(nicksSet(QStringList)),
+	    this, SLOT(updateNickSelector()));
+  }
+  updateNickSelector();
 }
 
 void InputWidget::updateNickSelector() const {
+  ui.ownNick->clear();
+
   const Network *net = currentNetwork();
   if(!net)
     return;
@@ -96,7 +136,6 @@ void InputWidget::updateNickSelector() const {
     nickIdx = 0;
   }
   
-  ui.ownNick->clear();
   ui.ownNick->addItems(nicks);
   ui.ownNick->setCurrentIndex(nickIdx);
 }
@@ -108,12 +147,6 @@ void InputWidget::changeNick(const QString &newNick) const {
   emit userInput(currentBufferInfo, QString("/nick %1").arg(newNick));
 }
 
-void InputWidget::enterPressed() {
-  QStringList lines = ui.inputEdit->text().split('\n', QString::SkipEmptyParts);
-  foreach(QString msg, lines) {
-    if(msg.isEmpty()) continue;
-    emit userInput(currentBufferInfo, msg);
-  }
-  ui.inputEdit->clear();
+void InputWidget::sendText(QString text) {
+  emit userInput(currentBufferInfo, text);
 }
-