X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=0c66767884002a619a9afcf9af55ed0538b6b5df;hb=b68ffc844fc7504ecceeaa9348107ca5c249bd51;hp=c2ef731e21e5fa092f63305ac56ed699cdfe6c4d;hpb=c19a8e707391d74a80e9e7d4ef46f496284d9f49;p=quassel.git diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index c2ef731e..0c667678 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -20,15 +20,15 @@ #include "inputwidget.h" +#include "ircuser.h" #include "client.h" #include "networkmodel.h" #include "jumpkeyhandler.h" + InputWidget::InputWidget(QWidget *parent) - : QWidget(parent), - validBuffer(false), - _bufferModel(0), - _selectionModel(0) + : AbstractItemView(parent), + validBuffer(false) { ui.setupUi(this); connect(ui.inputEdit, SIGNAL(sendText(QString)), this, SLOT(sendText(QString))); @@ -36,30 +36,13 @@ InputWidget::InputWidget(QWidget *parent) connect(this, SIGNAL(userInput(BufferInfo, QString)), Client::instance(), SIGNAL(sendInput(BufferInfo, QString))); setFocusProxy(ui.inputEdit); + ui.ownNick->installEventFilter(new MouseWheelFilter(this)); ui.inputEdit->installEventFilter(new JumpKeyHandler(this)); } InputWidget::~InputWidget() { } -void InputWidget::setModel(BufferModel *bufferModel) { - if(_bufferModel) { - disconnect(_bufferModel, 0, this, 0); - } - _bufferModel = bufferModel; - connect(bufferModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), - this, SLOT(dataChanged(QModelIndex, QModelIndex))); -} - -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))); -} - void InputWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(previous); @@ -81,7 +64,7 @@ void InputWidget::currentChanged(const QModelIndex ¤t, const QModelIndex & void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { QItemSelectionRange changedArea(topLeft, bottomRight); - QModelIndex currentIndex = Client::bufferModel()->currentIndex(); + QModelIndex currentIndex = selectionModel()->currentIndex(); if(changedArea.contains(currentIndex)) { ui.inputEdit->setEnabled(currentIndex.data(NetworkModel::ItemActiveRole).value()); } @@ -100,15 +83,21 @@ void InputWidget::setNetwork(const Network *network) { return; const Network *previousNet = Client::network(_networkId); - if(previousNet) + if(previousNet) { disconnect(previousNet, 0, this, 0); + if(previousNet->me()) + disconnect(previousNet->me(), 0, this, 0); + } 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))); + 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()); } @@ -149,7 +138,10 @@ void InputWidget::updateNickSelector() const { nicks.prepend(net->myNick()); nickIdx = 0; } - + + if(net->me() && nickIdx < nicks.count()) + nicks[nickIdx] = net->myNick() + QString(" (%1)").arg(net->me()->userModes()); + ui.ownNick->addItems(nicks); ui.ownNick->setCurrentIndex(nickIdx); } @@ -164,3 +156,17 @@ void InputWidget::changeNick(const QString &newNick) const { 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; +}