X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=cd832a9173480ba5e9c3e2f59d8705b47f5513e8;hb=e531fd1f1ea36a360a9d876c94e73b0f3b1bcd22;hp=d6f0aad6faf84ce8848d39563e9b32892f16b46a;hpb=f66bc9ecb5ebde376da256035db425d7dc0c74d0;p=quassel.git

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index d6f0aad6..cd832a91 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -20,17 +20,19 @@
 
 #include "inputwidget.h"
 
-#include "ircuser.h"
+#include "action.h"
+#include "actioncollection.h"
 #include "client.h"
-#include "networkmodel.h"
+#include "iconloader.h"
+#include "ircuser.h"
 #include "jumpkeyhandler.h"
-
+#include "networkmodel.h"
+#include "qtui.h"
+#include "qtuisettings.h"
 
 InputWidget::InputWidget(QWidget *parent)
-  : QWidget(parent),
-    validBuffer(false),
-    _bufferModel(0),
-    _selectionModel(0)
+  : AbstractItemView(parent),
+    _networkId(0)
 {
   ui.setupUi(this);
   connect(ui.inputEdit, SIGNAL(sendText(QString)), this, SLOT(sendText(QString)));
@@ -38,68 +40,85 @@ 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));
 
-InputWidget::~InputWidget() {
-}
-
-void InputWidget::setModel(BufferModel *bufferModel) {
-  if(_bufferModel) {
-    disconnect(_bufferModel, 0, this, 0);
+  QtUiSettings s;
+  bool useInputLineFont = s.value("UseInputLineFont", QVariant(false)).toBool();
+  if(useInputLineFont) {
+    ui.inputEdit->setFont(s.value("InputLineFont").value<QFont>());
   }
-  _bufferModel = bufferModel;
-  connect(bufferModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
-	  this, SLOT(dataChanged(QModelIndex, QModelIndex)));
+
+  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"));
 }
 
-void InputWidget::setSelectionModel(QItemSelectionModel *selectionModel) {
-  if(_selectionModel) {
-    disconnect(_selectionModel, 0, this, 0);
-  }
-  _selectionModel = selectionModel;
-  connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-	  this, SLOT(currentChanged(QModelIndex, QModelIndex)));
+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())
+  NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value<NetworkId>();
+  NetworkId previousNetworkId = previous.data(NetworkModel::NetworkIdRole).value<NetworkId>();
+  if(networkId == previousNetworkId)
     return;
 
-  currentBufferInfo  = current.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-  setNetwork(Client::networkModel()->networkByIndex(current));
+  setNetwork(networkId);
   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 = Client::bufferModel()->currentIndex();
-  if(changedArea.contains(currentIndex)) {
-    ui.inputEdit->setEnabled(currentIndex.data(NetworkModel::ItemActiveRole).value<bool>());
+  if(changedArea.contains(selectionModel()->currentIndex())) {
+    updateEnabledState();
   }
 };
 
+void InputWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
+  NetworkId networkId;
+  QModelIndex child;
+  for(int row = start; row <= end; row++) {
+    child = model()->index(row, 0, parent);
+    if(NetworkModel::NetworkItemType != child.data(NetworkModel::ItemTypeRole).toInt())
+      continue;
+    networkId = child.data(NetworkModel::NetworkIdRole).value<NetworkId>();
+    if(networkId == _networkId) {
+      setNetwork(0);
+      updateNickSelector();
+      return;
+    }
+  }
+}
 
-const Network *InputWidget::currentNetwork() const {
-  if(!validBuffer)
-    return 0;
+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);
 }
 
-void InputWidget::setNetwork(const Network *network) {
-  if(!network || _networkId == network->networkId())
+BufferInfo InputWidget::currentBufferInfo() const {
+  return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+};
+
+void InputWidget::setNetwork(NetworkId networkId) {
+  if(_networkId == networkId)
     return;
 
   const Network *previousNet = Client::network(_networkId);
@@ -109,20 +128,34 @@ void InputWidget::setNetwork(const Network *network) {
       disconnect(previousNet->me(), 0, this, 0);
   }
 
+  _networkId = networkId;
+
+  const Network *network = Client::network(networkId);
   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()));
-    }
+    if(network->me())
+      connectMyIrcUser();
+    else
+      connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
+    setIdentity(network->identity());
+  } else {
+    setIdentity(0);
   }
-  setIdentity(network->identity());
 }
 
-void InputWidget::setIdentity(const IdentityId &identityId) {
+void InputWidget::connectMyIrcUser() {
+  const Network *network = currentNetwork();
+  if(network->me()) {
+    connect(network->me(), SIGNAL(nickSet(const 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()));
+    connect(network->me(), SIGNAL(awaySet(bool)), this, SLOT(updateNickSelector()));
+    disconnect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
+  }
+}
+
+void InputWidget::setIdentity(IdentityId identityId) {
   if(_identityId == identityId)
     return;
 
@@ -130,9 +163,10 @@ void InputWidget::setIdentity(const IdentityId &identityId) {
   if(previousIdentity)
     disconnect(previousIdentity, 0, this, 0);
 
+  _identityId = identityId;
+
   const Identity *identity = Client::identity(identityId);
   if(identity) {
-    _identityId = identityId;
     connect(identity, SIGNAL(nicksSet(QStringList)),
 	    this, SLOT(updateNickSelector()));
   }
@@ -159,10 +193,18 @@ void InputWidget::updateNickSelector() const {
     nickIdx = 0;
   }
 
-  if(net->me() && nickIdx < nicks.count())
-    nicks[nickIdx] = net->myNick() + QString(" (%1)").arg(net->me()->userModes());
+  if(nicks.isEmpty())
+    return;
+
+  IrcUser *me = net->me();
+  if(me)
+    nicks[nickIdx] = net->myNick() + QString(" (+%1)").arg(me->userModes());
       
   ui.ownNick->addItems(nicks);
+
+  if(me && me->isAway())
+    ui.ownNick->setItemData(nickIdx, SmallIcon("user-away"), Qt::DecorationRole);
+
   ui.ownNick->setCurrentIndex(nickIdx);
 }
 
@@ -170,11 +212,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);
 }