some minor smoothifications to the nick selector

[quassel.git] / src / qtui / inputwidget.cpp

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index a7d7d1c..cd48764 100644 (file)
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,13 +20,16 @@
 
 #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)
   : AbstractItemView(parent),
     _networkId(0)
@@ -46,17 +49,25 @@ 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() {
 }
 
 void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
-  if(current.data(NetworkModel::BufferInfoRole) == previous.data(NetworkModel::BufferInfoRole))
+  Q_UNUSED(previous)
+  NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value<NetworkId>();
+  if(networkId == _networkId)
     return;
 
-  const Network *net = Client::networkModel()->networkByIndex(current);
-  setNetwork(net);
+  setNetwork(networkId);
   updateNickSelector();
   updateEnabledState();
 }
@@ -68,6 +79,22 @@ void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot
   }
 };
 
+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;
+    }
+  }
+}
+
 void InputWidget::updateEnabledState() {
   QModelIndex currentIndex = selectionModel()->currentIndex();
   
@@ -90,8 +117,8 @@ BufferInfo InputWidget::currentBufferInfo() const {
   return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value<BufferInfo>();
 };
 
-void InputWidget::setNetwork(const Network *network) {
-  if(!network || _networkId == network->networkId())
+void InputWidget::setNetwork(NetworkId networkId) {
+  if(_networkId == networkId)
     return;
 
   const Network *previousNet = Client::network(_networkId);
@@ -101,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()));
-    }
+    connectMyIrcUser();
+    setIdentity(network->identity());
+  } else {
+    setIdentity(0);
+    _networkId = 0;
+  }
+}
+
+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()));
+  } else {
+    connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
   }
-  setIdentity(network->identity());
 }
 
-void InputWidget::setIdentity(const IdentityId &identityId) {
+void InputWidget::setIdentity(IdentityId identityId) {
   if(_identityId == identityId)
     return;
 
@@ -122,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()));
   }
@@ -151,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);
 }