Closing BR #126

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

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 5f31670..d6f0aad 100644 (file)
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -20,8 +20,11 @@
 
 #include "inputwidget.h"
 
+#include "ircuser.h"
 #include "client.h"
 #include "networkmodel.h"
+#include "jumpkeyhandler.h"
+
 
 InputWidget::InputWidget(QWidget *parent)
   : QWidget(parent),
@@ -34,13 +37,21 @@ InputWidget::InputWidget(QWidget *parent)
   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.ownNick->installEventFilter(new MouseWheelFilter(this));
+  ui.inputEdit->installEventFilter(new JumpKeyHandler(this));  
 }
 
 InputWidget::~InputWidget() {
 }
 
 void InputWidget::setModel(BufferModel *bufferModel) {
+  if(_bufferModel) {
+    disconnect(_bufferModel, 0, this, 0);
+  }
   _bufferModel = bufferModel;
+  connect(bufferModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
+         this, SLOT(dataChanged(QModelIndex, QModelIndex)));
 }
 
 void InputWidget::setSelectionModel(QItemSelectionModel *selectionModel) {
@@ -71,6 +82,15 @@ void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &
   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;
@@ -79,19 +99,25 @@ const Network *InputWidget::currentNetwork() const {
 }
 
 void InputWidget::setNetwork(const Network *network) {
-  if(_networkId == network->networkId())
+  if(!network || _networkId == network->networkId())
     return;
 
   const Network *previousNet = Client::network(_networkId);
-  if(previousNet)
+  if(previousNet) {
     disconnect(previousNet, 0, this, 0);
+    if(previousNet->me())
+      disconnect(previousNet->me(), 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)));
+    connect(network, SIGNAL(identitySet(IdentityId)), this, SLOT(setIdentity(IdentityId)));
+    if(network->me()) {
+      connect(network->me(), SIGNAL(nickSet(QString)), this, SLOT(updateNickSelector()));
+      connect(network->me(), SIGNAL(userModesSet(QString)), this, SLOT(updateNickSelector()));
+      connect(network->me(), SIGNAL(userModesAdded(QString)), this, SLOT(updateNickSelector()));
+      connect(network->me(), SIGNAL(userModesRemoved(QString)), this, SLOT(updateNickSelector()));
+    }
   }
   setIdentity(network->identity());
 }
@@ -132,7 +158,10 @@ void InputWidget::updateNickSelector() const {
     nicks.prepend(net->myNick());
     nickIdx = 0;
   }
-  
+
+  if(net->me() && nickIdx < nicks.count())
+    nicks[nickIdx] = net->myNick() + QString(" (%1)").arg(net->me()->userModes());
+      
   ui.ownNick->addItems(nicks);
   ui.ownNick->setCurrentIndex(nickIdx);
 }
@@ -147,3 +176,17 @@ void InputWidget::changeNick(const QString &newNick) const {
 void InputWidget::sendText(QString text) {
   emit userInput(currentBufferInfo, text);
 }
+
+
+// MOUSE WHEEL FILTER
+MouseWheelFilter::MouseWheelFilter(QObject *parent)
+  : QObject(parent)
+{
+}
+
+bool MouseWheelFilter::eventFilter(QObject *obj, QEvent *event) {
+  if(event->type() != QEvent::Wheel)
+    return QObject::eventFilter(obj, event);
+  else
+    return true;
+}