Newly created buffers are now selected automatically.

[quassel.git] / src / qtui / inputwidget.cpp

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 55fc20e..c2ef731 100644 (file)
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -22,8 +22,7 @@
 
 #include "client.h"
 #include "networkmodel.h"
 
 #include "client.h"
 #include "networkmodel.h"

-#include "network.h"
-#include "identity.h"
+#include "jumpkeyhandler.h"

 
 InputWidget::InputWidget(QWidget *parent)
   : QWidget(parent),
 
 InputWidget::InputWidget(QWidget *parent)
   : QWidget(parent),


@@ -32,17 +31,24 @@ InputWidget::InputWidget(QWidget *parent)
     _selectionModel(0)
 {
   ui.setupUi(this);
     _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);
   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() {
 }
 
 void InputWidget::setModel(BufferModel *bufferModel) {
 }
 
 InputWidget::~InputWidget() {
 }
 
 void InputWidget::setModel(BufferModel *bufferModel) {

+  if(_bufferModel) {
+    disconnect(_bufferModel, 0, this, 0);
+  }

   _bufferModel = bufferModel;
   _bufferModel = bufferModel;

+  connect(bufferModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
+         this, SLOT(dataChanged(QModelIndex, QModelIndex)));

 }
 
 void InputWidget::setSelectionModel(QItemSelectionModel *selectionModel) {
 }
 
 void InputWidget::setSelectionModel(QItemSelectionModel *selectionModel) {


@@ -68,19 +74,65 @@ void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &
     return;
 
   currentBufferInfo  = current.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
     return;
 
   currentBufferInfo  = current.data(NetworkModel::BufferInfoRole).value<BufferInfo>();

+  setNetwork(Client::networkModel()->networkByIndex(current));

   updateNickSelector();
   updateNickSelector();

-

   ui.inputEdit->setEnabled(current.data(NetworkModel::ItemActiveRole).value<bool>());
 }
 
   ui.inputEdit->setEnabled(current.data(NetworkModel::ItemActiveRole).value<bool>());
 }
 

+void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
+  QItemSelectionRange changedArea(topLeft, bottomRight);
+  QModelIndex currentIndex = Client::bufferModel()->currentIndex();
+  if(changedArea.contains(currentIndex)) {
+    ui.inputEdit->setEnabled(currentIndex.data(NetworkModel::ItemActiveRole).value<bool>());
+  }
+};
+
+

 const Network *InputWidget::currentNetwork() const {
   if(!validBuffer)
     return 0;
 
 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(!network || _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 {
 }
 
 void InputWidget::updateNickSelector() const {

+  ui.ownNick->clear();
+

   const Network *net = currentNetwork();
   if(!net)
     return;
   const Network *net = currentNetwork();
   if(!net)
     return;


@@ -98,7 +150,6 @@ void InputWidget::updateNickSelector() const {
     nickIdx = 0;
   }
   
     nickIdx = 0;
   }
   

-  ui.ownNick->clear();

   ui.ownNick->addItems(nicks);
   ui.ownNick->setCurrentIndex(nickIdx);
 }
   ui.ownNick->addItems(nicks);
   ui.ownNick->setCurrentIndex(nickIdx);
 }


@@ -110,12 +161,6 @@ void InputWidget::changeNick(const QString &newNick) const {
   emit userInput(currentBufferInfo, QString("/nick %1").arg(newNick));
 }
 
   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);

 }
 }

-