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 5f31670..c2ef731 100644 (file)
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -22,6 +22,7 @@
 
 #include "client.h"
 #include "networkmodel.h"
 
 #include "client.h"
 #include "networkmodel.h"

+#include "jumpkeyhandler.h"

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


@@ -34,13 +35,20 @@ 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);
   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) {


@@ -71,6 +79,15 @@ void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &
   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;


@@ -79,7 +96,7 @@ const Network *InputWidget::currentNetwork() const {
 }
 
 void InputWidget::setNetwork(const Network *network) {
 }
 
 void InputWidget::setNetwork(const Network *network) {

-  if(_networkId == network->networkId())
+  if(!network || _networkId == network->networkId())

     return;
 
   const Network *previousNet = Client::network(_networkId);
     return;
 
   const Network *previousNet = Client::network(_networkId);