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

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 0c667678..c1fbe7eb 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -24,11 +24,15 @@
 #include "client.h"
 #include "networkmodel.h"
 #include "jumpkeyhandler.h"
+#include "qtuisettings.h"
 
+#include "action.h"
+#include "actioncollection.h"
+#include "qtui.h"
 
 InputWidget::InputWidget(QWidget *parent)
   : AbstractItemView(parent),
-    validBuffer(false)
+    _networkId(0)
 {
   ui.setupUi(this);
   connect(ui.inputEdit, SIGNAL(sendText(QString)), this, SLOT(sendText(QString)));
@@ -36,48 +40,67 @@ InputWidget::InputWidget(QWidget *parent)
   connect(this, SIGNAL(userInput(BufferInfo, QString)), Client::instance(), SIGNAL(sendInput(BufferInfo, QString)));
   setFocusProxy(ui.inputEdit);
 
+  ui.ownNick->setSizeAdjustPolicy(QComboBox::AdjustToContents);
   ui.ownNick->installEventFilter(new MouseWheelFilter(this));
-  ui.inputEdit->installEventFilter(new JumpKeyHandler(this));  
+  ui.inputEdit->installEventFilter(new JumpKeyHandler(this));
+
+  QtUiSettings s;
+  bool useInputLineFont = s.value("UseInputLineFont", QVariant(false)).toBool();
+  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() {
 }
 
 void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
-  Q_UNUSED(previous);
-
-  validBuffer = current.isValid();
-
-  if(!validBuffer)
-    return;
-  
-  QVariant variant;
-  variant = current.data(NetworkModel::BufferInfoRole);
-  if(!variant.isValid())
+  if(current.data(NetworkModel::BufferInfoRole) == previous.data(NetworkModel::BufferInfoRole))
     return;
 
-  currentBufferInfo  = current.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-  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 {
-  if(!validBuffer)
-    return 0;
-
   return Client::network(_networkId);
 }
 
+BufferInfo InputWidget::currentBufferInfo() const {
+  return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+};
+
 void InputWidget::setNetwork(const Network *network) {
   if(!network || _networkId == network->networkId())
     return;
@@ -140,7 +163,7 @@ void InputWidget::updateNickSelector() const {
   }
 
   if(net->me() && nickIdx < nicks.count())
-    nicks[nickIdx] = net->myNick() + QString(" (%1)").arg(net->me()->userModes());
+    nicks[nickIdx] = net->myNick() + QString(" (+%1)").arg(net->me()->userModes());
       
   ui.ownNick->addItems(nicks);
   ui.ownNick->setCurrentIndex(nickIdx);
@@ -150,11 +173,11 @@ void InputWidget::changeNick(const QString &newNick) const {
   const Network *net = currentNetwork();
   if(!net || net->isMyNick(newNick))
     return;
-  emit userInput(currentBufferInfo, QString("/nick %1").arg(newNick));
+  emit userInput(currentBufferInfo(), QString("/nick %1").arg(newNick));
 }
 
 void InputWidget::sendText(QString text) {
-  emit userInput(currentBufferInfo, text);
+  emit userInput(currentBufferInfo(), text);
 }