X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=c1fbe7eb2e49b618d65717d8987d32ee11455cf4;hp=a12671789d5a1ad738a69ffc7be8985028e75e54;hb=7b1d236596e90ebf7bc54a27fdc347c623c98dfa;hpb=ad801015af3afad53e0b245afc3a2214373a1b44

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index a1267178..c1fbe7eb 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -26,6 +26,9 @@
 #include "jumpkeyhandler.h"
 #include "qtuisettings.h"
 
+#include "action.h"
+#include "actioncollection.h"
+#include "qtui.h"
 
 InputWidget::InputWidget(QWidget *parent)
   : AbstractItemView(parent),
@@ -46,6 +49,14 @@ InputWidget::InputWidget(QWidget *parent)
   if(useInputLineFont) {
     ui.inputEdit->setFont(s.value("InputLineFont").value<QFont>());
   }
+
+  ActionCollection *coll = QtUi::actionCollection();
+
+  Action *activateInputline = coll->add<Action>("FocusInputLine");
+  connect(activateInputline, SIGNAL(triggered()), SLOT(setFocus()));
+  activateInputline->setText(tr("Focus Input Line"));
+  activateInputline->setShortcut(tr("Ctrl+L"));
+
 }
 
 InputWidget::~InputWidget() {
@@ -55,19 +66,32 @@ void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &
   if(current.data(NetworkModel::BufferInfoRole) == previous.data(NetworkModel::BufferInfoRole))
     return;
 
-  setNetwork(Client::networkModel()->networkByIndex(current));
+  const Network *net = Client::networkModel()->networkByIndex(current);
+  setNetwork(net);
   updateNickSelector();
-  ui.inputEdit->setEnabled(current.data(NetworkModel::ItemActiveRole).value<bool>());
+  updateEnabledState();
 }
 
 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>());
+  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...
+    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);
+}
 
 const Network *InputWidget::currentNetwork() const {
   return Client::network(_networkId);