fixing deactivation of inputline during a query when chatpartner goes away

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 37f8488..a7d7d1c 100644 (file)
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -58,26 +58,30 @@ void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &
   const Network *net = Client::networkModel()->networkByIndex(current);
   setNetwork(net);
   updateNickSelector();
   const Network *net = Client::networkModel()->networkByIndex(current);
   setNetwork(net);
   updateNickSelector();

+  updateEnabledState();
+}

 
 

+void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
+  QItemSelectionRange changedArea(topLeft, bottomRight);
+  if(changedArea.contains(selectionModel()->currentIndex())) {
+    updateEnabledState();
+  }
+};
+
+void InputWidget::updateEnabledState() {
+  QModelIndex currentIndex = selectionModel()->currentIndex();
+  
+  const Network *net = Client::networkModel()->networkByIndex(currentIndex);

   bool enabled = false;
   if(net) {
     // disable inputline if it's a channelbuffer we parted from or...
   bool enabled = false;
   if(net) {
     // disable inputline if it's a channelbuffer we parted from or...

-    enabled = (current.data(NetworkModel::ItemActiveRole).value<bool>() || (current.data(NetworkModel::BufferTypeRole).toInt() != BufferInfo::ChannelBuffer));
+    enabled = (currentIndex.data(NetworkModel::ItemActiveRole).value<bool>() || (currentIndex.data(NetworkModel::BufferTypeRole).toInt() != BufferInfo::ChannelBuffer));

     // ... if we're not connected to the network at all
     enabled &= net->isConnected();
   }
   ui.inputEdit->setEnabled(enabled);
 }
 
     // ... if we're not connected to the network at all
     enabled &= net->isConnected();
   }
   ui.inputEdit->setEnabled(enabled);
 }
 

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

 const Network *InputWidget::currentNetwork() const {
   return Client::network(_networkId);
 }
 const Network *InputWidget::currentNetwork() const {
   return Client::network(_networkId);
 }

diff --git a/src/qtui/inputwidget.h b/src/qtui/inputwidget.h
index 0becb38..5bffbc7 100644 (file)
--- a/src/qtui/inputwidget.h
+++ b/src/qtui/inputwidget.h
@@ -49,6 +49,7 @@ private slots:
   void setNetwork(const Network *network);
   void setIdentity(const IdentityId &identityId);
   void updateNickSelector() const;
   void setNetwork(const Network *network);
   void setIdentity(const IdentityId &identityId);
   void updateNickSelector() const;

+  void updateEnabledState();

 
   BufferInfo currentBufferInfo() const;
 
 
   BufferInfo currentBufferInfo() const;
 


@@ -60,7 +61,6 @@ private:
   
   NetworkId _networkId;
   IdentityId _identityId;
   
   NetworkId _networkId;
   IdentityId _identityId;

-

 };
 
 
 };