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

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index c1086287..c1fbe7eb 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -20,65 +20,131 @@
 
 #include "inputwidget.h"
 
+#include "ircuser.h"
 #include "client.h"
 #include "networkmodel.h"
-#include "network.h"
-#include "identity.h"
+#include "jumpkeyhandler.h"
+#include "qtuisettings.h"
+
+#include "action.h"
+#include "actioncollection.h"
+#include "qtui.h"
 
 InputWidget::InputWidget(QWidget *parent)
-  : QWidget(parent),
-    validBuffer(false),
-    _bufferModel(0),
-    _selectionModel(0)
+  : AbstractItemView(parent),
+    _networkId(0)
 {
   ui.setupUi(this);
-  connect(ui.inputEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
+  connect(ui.inputEdit, SIGNAL(sendText(QString)), this, SLOT(sendText(QString)));
   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->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+  ui.ownNick->installEventFilter(new MouseWheelFilter(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::setModel(BufferModel *bufferModel) {
-  _bufferModel = bufferModel;
+void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
+  if(current.data(NetworkModel::BufferInfoRole) == previous.data(NetworkModel::BufferInfoRole))
+    return;
+
+  const Network *net = Client::networkModel()->networkByIndex(current);
+  setNetwork(net);
+  updateNickSelector();
+  updateEnabledState();
 }
 
-void InputWidget::setSelectionModel(QItemSelectionModel *selectionModel) {
-  if(_selectionModel) {
-    disconnect(_selectionModel, 0, this, 0);
+void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
+  QItemSelectionRange changedArea(topLeft, bottomRight);
+  if(changedArea.contains(selectionModel()->currentIndex())) {
+    updateEnabledState();
   }
-  _selectionModel = selectionModel;
-  connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-	  this, SLOT(currentChanged(QModelIndex, QModelIndex)));
+};
+
+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);
 }
 
-void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
-  Q_UNUSED(previous);
+const Network *InputWidget::currentNetwork() const {
+  return Client::network(_networkId);
+}
 
-  validBuffer = current.isValid();
+BufferInfo InputWidget::currentBufferInfo() const {
+  return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+};
 
-  if(!validBuffer)
-    return;
-  
-  QVariant variant;
-  variant = current.data(NetworkModel::BufferInfoRole);
-  if(!variant.isValid())
+void InputWidget::setNetwork(const Network *network) {
+  if(!network || _networkId == network->networkId())
     return;
 
-  currentBufferInfo  = current.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-  updateNickSelector();
+  const Network *previousNet = Client::network(_networkId);
+  if(previousNet) {
+    disconnect(previousNet, 0, this, 0);
+    if(previousNet->me())
+      disconnect(previousNet->me(), 0, this, 0);
+  }
+
+  if(network) {
+    _networkId = network->networkId();
+    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());
 }
 
-const Network *InputWidget::currentNetwork() const {
-  if(!validBuffer)
-    return 0;
+void InputWidget::setIdentity(const IdentityId &identityId) {
+  if(_identityId == identityId)
+    return;
 
-  return Client::network(currentBufferInfo.networkId());
+  const Identity *previousIdentity = Client::identity(_identityId);
+  if(previousIdentity)
+    disconnect(previousIdentity, 0, this, 0);
+
+  const Identity *identity = Client::identity(identityId);
+  if(identity) {
+    _identityId = identityId;
+    connect(identity, SIGNAL(nicksSet(QStringList)),
+	    this, SLOT(updateNickSelector()));
+  }
+  updateNickSelector();
 }
 
 void InputWidget::updateNickSelector() const {
+  ui.ownNick->clear();
+
   const Network *net = currentNetwork();
   if(!net)
     return;
@@ -95,8 +161,10 @@ void InputWidget::updateNickSelector() const {
     nicks.prepend(net->myNick());
     nickIdx = 0;
   }
-  
-  ui.ownNick->clear();
+
+  if(net->me() && nickIdx < nicks.count())
+    nicks[nickIdx] = net->myNick() + QString(" (+%1)").arg(net->me()->userModes());
+      
   ui.ownNick->addItems(nicks);
   ui.ownNick->setCurrentIndex(nickIdx);
 }
@@ -105,15 +173,23 @@ 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::enterPressed() {
-  QStringList lines = ui.inputEdit->text().split('\n', QString::SkipEmptyParts);
-  foreach(QString msg, lines) {
-    if(msg.isEmpty()) continue;
-    emit userInput(currentBufferInfo, msg);
-  }
-  ui.inputEdit->clear();
+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;
+}