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 0f4a7ee..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  *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -20,15 +20,19 @@
 
 #include "inputwidget.h"
 
 
 #include "inputwidget.h"
 

+#include "action.h"
+#include "actioncollection.h"

 #include "client.h"
 #include "client.h"

-#include "networkmodel.h"
+#include "iconloader.h"
+#include "ircuser.h"

 #include "jumpkeyhandler.h"
 #include "jumpkeyhandler.h"

+#include "networkmodel.h"
+#include "qtui.h"
+#include "qtuisettings.h"

 
 InputWidget::InputWidget(QWidget *parent)
 
 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)));
 {
   ui.setupUi(this);
   connect(ui.inputEdit, SIGNAL(sendText(QString)), this, SLOT(sendText(QString)));


@@ -36,84 +40,122 @@ InputWidget::InputWidget(QWidget *parent)
   connect(this, SIGNAL(userInput(BufferInfo, QString)), Client::instance(), SIGNAL(sendInput(BufferInfo, QString)));
   setFocusProxy(ui.inputEdit);
 
   connect(this, SIGNAL(userInput(BufferInfo, QString)), Client::instance(), SIGNAL(sendInput(BufferInfo, QString)));
   setFocusProxy(ui.inputEdit);
 

-  ui.inputEdit->installEventFilter(new JumpKeyHandler(this));  
-}
-
-InputWidget::~InputWidget() {
-}
+  ui.ownNick->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+  ui.ownNick->installEventFilter(new MouseWheelFilter(this));
+  ui.inputEdit->installEventFilter(new JumpKeyHandler(this));

 
 

-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) {
 }
 
 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())
+  Q_UNUSED(previous)
+  NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value<NetworkId>();
+  if(networkId == _networkId)

     return;
 
     return;
 

-  currentBufferInfo  = current.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-  setNetwork(Client::networkModel()->networkByIndex(current));
+  setNetwork(networkId);

   updateNickSelector();
   updateNickSelector();

-  ui.inputEdit->setEnabled(current.data(NetworkModel::ItemActiveRole).value<bool>());
+  updateEnabledState();

 }
 
 void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
   QItemSelectionRange changedArea(topLeft, bottomRight);
 }
 
 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;
+    }
+  }
+}
+
+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 {
 
 const Network *InputWidget::currentNetwork() const {

-  if(!validBuffer)
-    return 0;
-

   return Client::network(_networkId);
 }
 
   return Client::network(_networkId);
 }
 

-void InputWidget::setNetwork(const Network *network) {
-  if(_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);
     return;
 
   const Network *previousNet = Client::network(_networkId);

-  if(previousNet)
+  if(previousNet) {

     disconnect(previousNet, 0, this, 0);
     disconnect(previousNet, 0, this, 0);

+    if(previousNet->me())
+      disconnect(previousNet->me(), 0, this, 0);
+  }

 
 

+  _networkId = networkId;
+
+  const Network *network = Client::network(networkId);

   if(network) {
   if(network) {

-    _networkId = network->networkId();
-    connect(network, SIGNAL(myNickSet(QString)),
-           this, SLOT(updateNickSelector()));
-    connect(network, SIGNAL(identitySet(IdentityId)),
-           this, SLOT(setIdentity(IdentityId)));
+    connect(network, SIGNAL(identitySet(IdentityId)), this, SLOT(setIdentity(IdentityId)));
+    connectMyIrcUser();
+    setIdentity(network->identity());
+  } else {
+    setIdentity(0);
+    _networkId = 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()));
+  } else {
+    connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
+  }
+}
+
+void InputWidget::setIdentity(IdentityId identityId) {

   if(_identityId == identityId)
     return;
 
   if(_identityId == identityId)
     return;
 


@@ -121,9 +163,10 @@ void InputWidget::setIdentity(const IdentityId &identityId) {
   if(previousIdentity)
     disconnect(previousIdentity, 0, this, 0);
 
   if(previousIdentity)
     disconnect(previousIdentity, 0, this, 0);
 

+  _identityId = identityId;
+

   const Identity *identity = Client::identity(identityId);
   if(identity) {
   const Identity *identity = Client::identity(identityId);
   if(identity) {

-    _identityId = identityId;

     connect(identity, SIGNAL(nicksSet(QStringList)),
            this, SLOT(updateNickSelector()));
   }
     connect(identity, SIGNAL(nicksSet(QStringList)),
            this, SLOT(updateNickSelector()));
   }


@@ -149,8 +192,19 @@ void InputWidget::updateNickSelector() const {
     nicks.prepend(net->myNick());
     nickIdx = 0;
   }
     nicks.prepend(net->myNick());
     nickIdx = 0;
   }

-  
+
+  if(nicks.isEmpty())
+    return;
+
+  IrcUser *me = net->me();
+  if(me)
+    nicks[nickIdx] = net->myNick() + QString(" (+%1)").arg(me->userModes());
+      

   ui.ownNick->addItems(nicks);
   ui.ownNick->addItems(nicks);

+
+  if(me && me->isAway())
+    ui.ownNick->setItemData(nickIdx, SmallIcon("user-away"), Qt::DecorationRole);
+

   ui.ownNick->setCurrentIndex(nickIdx);
 }
 
   ui.ownNick->setCurrentIndex(nickIdx);
 }
 


@@ -158,9 +212,23 @@ void InputWidget::changeNick(const QString &newNick) const {
   const Network *net = currentNetwork();
   if(!net || net->isMyNick(newNick))
     return;
   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) {
 }
 
 void InputWidget::sendText(QString text) {

-  emit userInput(currentBufferInfo, 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;

 }
 }