From f66bc9ecb5ebde376da256035db425d7dc0c74d0 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Tue, 11 Mar 2008 00:22:50 +0000 Subject: [PATCH] Closing BR #126 - MouseWheelEvents in the nick selector no longer trigger nick changes - nick selector shows now own user modes - implemented user modes Breaking protocol again! \o/ --- src/common/ircuser.cpp | 24 ++++++++++++++-------- src/common/ircuser.h | 13 +++++------- src/common/network.h | 1 + src/core/ircserverhandler.cpp | 24 ++++++++++++++++++++++ src/qtui/inputwidget.cpp | 38 +++++++++++++++++++++++++++++------ src/qtui/inputwidget.h | 9 +++++++++ version.inc | 8 ++++---- 7 files changed, 91 insertions(+), 26 deletions(-) diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp index 54a57647..ed875e03 100644 --- a/src/common/ircuser.cpp +++ b/src/common/ircuser.cpp @@ -287,16 +287,24 @@ void IrcUser::setUserModes(const QString &modes) { emit userModesSet(modes); } -void IrcUser::addUserMode(const QString &mode) { - if(!_userModes.contains(mode)) { - _userModes += mode; - emit userModeAdded(mode); +void IrcUser::addUserModes(const QString &modes) { + if(modes.isEmpty()) + return; + + for(int i = 0; i < modes.count(); i++) { + if(!_userModes.contains(modes[i])) + _userModes += modes[i]; } + + emit userModesAdded(modes); } -void IrcUser::removeUserMode(const QString &mode) { - if(_userModes.contains(mode)) { - _userModes.remove(mode); - emit userModeRemoved(mode); +void IrcUser::removeUserModes(const QString &modes) { + if(modes.isEmpty()) + return; + + for(int i = 0; i < modes.count(); i++) { + _userModes.remove(modes[i]); } + emit userModesRemoved(modes); } diff --git a/src/common/ircuser.h b/src/common/ircuser.h index 3a46af84..ea1eb3f6 100644 --- a/src/common/ircuser.h +++ b/src/common/ircuser.h @@ -48,7 +48,7 @@ class IrcUser : public SyncableObject { Q_PROPERTY(int lastAwayMessage READ lastAwayMessage WRITE setLastAwayMessage STORED false) Q_PROPERTY(QStringList channels READ channels STORED false) - // Q_PROPERTY(QStringList usermodes READ usermodes WRITE setUsermodes) + Q_PROPERTY(QString userModes READ userModes WRITE setUserModes) public: IrcUser(const QString &hostmask, Network *network); @@ -102,8 +102,8 @@ public slots: void partChannel(IrcChannel *channel); void partChannel(const QString &channelname); - void addUserMode(const QString &mode); - void removeUserMode(const QString &mode); + void addUserModes(const QString &modes); + void removeUserModes(const QString &modes); signals: void userSet(QString user); @@ -123,11 +123,8 @@ signals: // void channelJoined(QString channel); void channelParted(QString channel); - void userModeAdded(QString mode); - void userModeRemoved(QString mode); - -// void setUsermodes(const QSet &usermodes); -// QSet usermodes() const; + void userModesAdded(QString modes); + void userModesRemoved(QString modes); private slots: void updateObjectName(); diff --git a/src/common/network.h b/src/common/network.h index d065306b..bf430f8e 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -95,6 +95,7 @@ public: QString networkName() const; QString currentServer() const; QString myNick() const; + inline IrcUser *me() const { return ircUser(myNick()); } IdentityId identity() const; QStringList nicks() const; QStringList channels() const; diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index ae92b093..31d5bec8 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -228,6 +228,30 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList } else { // pure User Modes + IrcUser *ircUser = network()->newIrcUser(params[0]); + QString modeString(serverDecode(params[1])); + QString addModes; + QString removeModes; + bool add = false; + for(int c = 0; c < modeString.count(); c++) { + if(modeString[c] == '+') { + add = true; + continue; + } + if(modeString[c] == '-') { + add = false; + continue; + } + if(add) + addModes += modeString[c]; + else + removeModes += modeString[c]; + } + if(!addModes.isEmpty()) + ircUser->addUserModes(addModes); + if(!removeModes.isEmpty()) + ircUser->removeUserModes(removeModes); + // FIXME: redirect emit displayMsg(Message::Mode, BufferInfo::StatusBuffer, "", serverDecode(params).join(" "), prefix); } diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index c2ef731e..d6f0aad6 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -20,10 +20,12 @@ #include "inputwidget.h" +#include "ircuser.h" #include "client.h" #include "networkmodel.h" #include "jumpkeyhandler.h" + InputWidget::InputWidget(QWidget *parent) : QWidget(parent), validBuffer(false), @@ -36,6 +38,7 @@ 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)); } @@ -100,15 +103,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 +158,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 +176,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; +} diff --git a/src/qtui/inputwidget.h b/src/qtui/inputwidget.h index 70449d2c..141105fe 100644 --- a/src/qtui/inputwidget.h +++ b/src/qtui/inputwidget.h @@ -79,4 +79,13 @@ private: }; + +class MouseWheelFilter : public QObject { + Q_OBJECT + +public: + MouseWheelFilter(QObject *parent = 0); + virtual bool eventFilter(QObject *obj, QEvent *event); +}; + #endif // INPUTWIDGET_H diff --git a/version.inc b/version.inc index cb1fb4d0..a83d2538 100644 --- a/version.inc +++ b/version.inc @@ -4,15 +4,15 @@ { using namespace Global; quasselVersion = "0.2.0-alpha3-pre"; - quasselDate = "2008-03-10"; - quasselBuild = 624; + quasselDate = "2008-03-11"; + quasselBuild = 628; //! Minimum client build number the core needs - clientBuildNeeded = 620; + clientBuildNeeded = 628; clientVersionNeeded = quasselVersion; //! Minimum core build number the client needs - coreBuildNeeded = 620; + coreBuildNeeded = 628; coreVersionNeeded = quasselVersion; } -- 2.20.1