X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=b45767fc7fe249005cf6bc4c0eb33857b063b95d;hp=f0d4c02a8e2176d3e7ba03b11394eac44f3135fb;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49 diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h index f0d4c02a..b45767fc 100644 --- a/src/client/networkmodel.h +++ b/src/client/networkmodel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,8 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef NETWORKMODEL_H -#define NETWORKMODEL_H +#pragma once + +#include "client-export.h" #include "bufferinfo.h" #include "clientsettings.h" @@ -40,47 +41,62 @@ class NetworkItem : public PropertyMapItem Q_PROPERTY(QString currentServer READ currentServer) Q_PROPERTY(int nickCount READ nickCount) -public : - NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0); - - virtual QVariant data(int column, int row) const; +public: + NetworkItem(const NetworkId& netid, AbstractTreeItem* parent = nullptr); + + QStringList propertyOrder() const override; + + QVariant data(int column, int row) const override; + + /** + * Escapes a string as HTML, ready for Qt markup. + * + * Implementation depends on Qt version - Qt4 uses Qt::escape, while Qt5 uses .toHtmlEscaped(). + * + * @param[in] string QString to escape + * @param[in] useNonbreakingSpaces + * @parblock + * If true, replace spaces with non-breaking spaces (i.e. ' '), otherwise only HTML escape. + * @endparblock + */ + static QString escapeHTML(const QString& string, bool useNonbreakingSpaces = false); inline bool isActive() const { return (bool)_network ? _network->isConnected() : false; } - inline const NetworkId &networkId() const { return _networkId; } + inline const NetworkId& networkId() const { return _networkId; } inline QString networkName() const { return (bool)_network ? _network->networkName() : QString(); } inline QString currentServer() const { return (bool)_network ? _network->currentServer() : QString(); } inline int nickCount() const { return (bool)_network ? _network->ircUsers().count() : 0; } - virtual QString toolTip(int column) const; + QString toolTip(int column) const override; - BufferItem *findBufferItem(BufferId bufferId); - inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); } - BufferItem *bufferItem(const BufferInfo &bufferInfo); - inline StatusBufferItem *statusBufferItem() const { return _statusBufferItem; } + BufferItem* findBufferItem(BufferId bufferId); + inline BufferItem* findBufferItem(const BufferInfo& bufferInfo) { return findBufferItem(bufferInfo.bufferId()); } + BufferItem* bufferItem(const BufferInfo& bufferInfo); + inline StatusBufferItem* statusBufferItem() const { return _statusBufferItem; } public slots: - void setNetworkName(const QString &networkName); - void setCurrentServer(const QString &serverName); + void setNetworkName(const QString& networkName); + void setCurrentServer(const QString& serverName); - void attachNetwork(Network *network); - void attachIrcChannel(IrcChannel *channel); - void attachIrcUser(IrcUser *ircUser); + void attachNetwork(Network* network); + void attachIrcChannel(IrcChannel* channel); + void attachIrcUser(IrcUser* ircUser); signals: void networkDataChanged(int column = -1); private slots: void onBeginRemoveChilds(int start, int end); + void onNetworkDestroyed(); private: NetworkId _networkId; - StatusBufferItem *_statusBufferItem; + StatusBufferItem* _statusBufferItem; QPointer _network; }; - /***************************************** * Fancy Buffer Items *****************************************/ @@ -91,22 +107,24 @@ class BufferItem : public PropertyMapItem Q_PROPERTY(QString topic READ topic) Q_PROPERTY(int nickCount READ nickCount) -public : - BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent = 0); +public: + BufferItem(BufferInfo bufferInfo, AbstractTreeItem* parent = nullptr); + + QStringList propertyOrder() const override; - inline const BufferInfo &bufferInfo() const { return _bufferInfo; } - virtual QVariant data(int column, int role) const; - virtual bool setData(int column, const QVariant &value, int role); + inline const BufferInfo& bufferInfo() const { return _bufferInfo; } + QVariant data(int column, int role) const override; + bool setData(int column, const QVariant& value, int role) override; inline BufferId bufferId() const { return _bufferInfo.bufferId(); } inline BufferInfo::Type bufferType() const { return _bufferInfo.type(); } - virtual void setBufferName(const QString &name); + virtual void setBufferName(const QString& name); virtual inline QString bufferName() const { return _bufferInfo.bufferName(); } virtual inline QString topic() const { return QString(); } virtual inline int nickCount() const { return 0; } - virtual inline bool isActive() const { return qobject_cast(parent())->isActive(); } + virtual inline bool isActive() const { return qobject_cast(parent())->isActive(); } inline MsgId lastSeenMsgId() const { return _lastSeenMsgId; } inline MsgId markerLineMsgId() const { return _markerLineMsgId; } @@ -116,15 +134,18 @@ public : inline BufferInfo::ActivityLevel activityLevel() const { return _activity; } void setActivityLevel(BufferInfo::ActivityLevel level); void clearActivityLevel(); - void updateActivityLevel(const Message &msg); + void updateActivityLevel(const Message& msg); + void setActivity(Message::Types msg, bool highlight); + bool addActivity(Message::Types msg, bool highlight); - inline const MsgId &firstUnreadMsgId() const { return _firstUnreadMsgId; } + inline const MsgId& firstUnreadMsgId() const { return _firstUnreadMsgId; } bool isCurrentBuffer() const; - virtual QString toolTip(int column) const; + QString toolTip(int column) const override; public slots: - virtual inline void setTopic(const QString &) { emit dataChanged(1); } + virtual inline void setTopic(const QString&) { emit dataChanged(1); } + virtual inline void setEncrypted(bool) { emit dataChanged(); } private: BufferInfo _bufferInfo; @@ -134,52 +155,49 @@ private: MsgId _firstUnreadMsgId; }; - /***************************************** -* StatusBufferItem -*****************************************/ + * StatusBufferItem + *****************************************/ class StatusBufferItem : public BufferItem { Q_OBJECT public: - StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent); + StatusBufferItem(const BufferInfo& bufferInfo, NetworkItem* parent); - virtual QString toolTip(int column) const; - virtual inline QString bufferName() const { return tr("Status Buffer"); } + QString toolTip(int column) const override; + inline QString bufferName() const override { return tr("Status Buffer"); } }; - /***************************************** -* QueryBufferItem -*****************************************/ + * QueryBufferItem + *****************************************/ class QueryBufferItem : public BufferItem { Q_OBJECT public: - QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent); + QueryBufferItem(const BufferInfo& bufferInfo, NetworkItem* parent); - virtual QVariant data(int column, int role) const; - virtual bool setData(int column, const QVariant &value, int role); + QVariant data(int column, int role) const override; + bool setData(int column, const QVariant& value, int role) override; - virtual inline bool isActive() const { return (bool)_ircUser; } - virtual QString toolTip(int column) const; + inline bool isActive() const override { return (bool)_ircUser; } + QString toolTip(int column) const override; - virtual void setBufferName(const QString &name); + void setBufferName(const QString& name) override; public slots: - void setIrcUser(IrcUser *ircUser); + void setIrcUser(IrcUser* ircUser); void removeIrcUser(); private: - IrcUser *_ircUser; + IrcUser* _ircUser; }; - /***************************************** -* ChannelBufferItem -*****************************************/ + * ChannelBufferItem + *****************************************/ class UserCategoryItem; class ChannelBufferItem : public BufferItem @@ -187,56 +205,67 @@ class ChannelBufferItem : public BufferItem Q_OBJECT public: - ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent); + ChannelBufferItem(const BufferInfo& bufferInfo, AbstractTreeItem* parent); + + QVariant data(int column, int role) const override; + inline bool isActive() const override { return (bool)_ircChannel; } + QString toolTip(int column) const override; - virtual QVariant data(int column, int role) const; - virtual inline bool isActive() const { return (bool)_ircChannel; } - virtual QString toolTip(int column) const; + inline QString topic() const override { return (bool)_ircChannel ? _ircChannel->topic() : QString(); } + inline int nickCount() const override { return (bool)_ircChannel ? _ircChannel->ircUsers().count() : 0; } - virtual inline QString topic() const { return (bool)_ircChannel ? _ircChannel->topic() : QString(); } - virtual inline int nickCount() const { return (bool)_ircChannel ? _ircChannel->ircUsers().count() : 0; } + void attachIrcChannel(IrcChannel* ircChannel); - void attachIrcChannel(IrcChannel *ircChannel); + /** + * Gets the list of channel modes for a given nick. + * + * @param[in] nick IrcUser nickname to check + * @returns Channel modes as a string if any, otherwise empty string + */ + QString nickChannelModes(const QString& nick) const; public slots: - void join(const QList &ircUsers); - void part(IrcUser *ircUser); + void join(const QList& ircUsers); + void part(IrcUser* ircUser); - UserCategoryItem *findCategoryItem(int categoryId); - void addUserToCategory(IrcUser *ircUser); - void addUsersToCategory(const QList &ircUser); - void removeUserFromCategory(IrcUser *ircUser); - void userModeChanged(IrcUser *ircUser); + UserCategoryItem* findCategoryItem(int categoryId); + void addUserToCategory(IrcUser* ircUser); + void addUsersToCategory(const QList& ircUser); + void removeUserFromCategory(IrcUser* ircUser); + void userModeChanged(IrcUser* ircUser); private slots: void ircChannelParted(); + void ircChannelDestroyed(); private: - IrcChannel *_ircChannel; + IrcChannel* _ircChannel; }; - /***************************************** -* User Category Items (like @vh etc.) -*****************************************/ + * User Category Items (like @vh etc.) + *****************************************/ class IrcUserItem; -class UserCategoryItem : public PropertyMapItem + +class CLIENT_EXPORT UserCategoryItem : public PropertyMapItem { Q_OBJECT Q_PROPERTY(QString categoryName READ categoryName) -public : - UserCategoryItem(int category, AbstractTreeItem *parent); +public: + UserCategoryItem(int category, AbstractTreeItem* parent); + + QStringList propertyOrder() const override; QString categoryName() const; inline int categoryId() const { return _category; } - virtual QVariant data(int column, int role) const; + QVariant data(int column, int role) const override; - IrcUserItem *findIrcUser(IrcUser *ircUser); - void addUsers(const QList &ircUser); - bool removeUser(IrcUser *ircUser); + IrcUserItem* findIrcUser(IrcUser* ircUser); + void addUsers(const QList& ircUser); + bool removeUser(IrcUser* ircUser); - static int categoryFromModes(const QString &modes); + static int categoryFromModes(const QString& modes); private: int _category; @@ -244,24 +273,32 @@ private: static const QList categories; }; - /***************************************** -* Irc User Items -*****************************************/ + * Irc User Items + *****************************************/ class IrcUserItem : public PropertyMapItem { Q_OBJECT Q_PROPERTY(QString nickName READ nickName) -public : - IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent); +public: + IrcUserItem(IrcUser* ircUser, AbstractTreeItem* parent); + + QStringList propertyOrder() const override; inline QString nickName() const { return _ircUser ? _ircUser->nick() : QString(); } inline bool isActive() const { return _ircUser ? !_ircUser->isAway() : false; } - inline IrcUser *ircUser() { return _ircUser; } - virtual QVariant data(int column, int role) const; - virtual QString toolTip(int column) const; + inline IrcUser* ircUser() { return _ircUser; } + QVariant data(int column, int role) const override; + QString toolTip(int column) const override; + + /** + * Gets the list of channel modes for this nick if parented to channel. + * + * @returns Channel modes as a string if any, otherwise empty string + */ + QString channelModes() const; private slots: inline void ircUserQuited() { parent()->removeChild(this); } @@ -270,16 +307,16 @@ private: QPointer _ircUser; }; - /***************************************** * NetworkModel *****************************************/ -class NetworkModel : public TreeModel +class CLIENT_EXPORT NetworkModel : public TreeModel { Q_OBJECT public: - enum Role { + enum Role + { BufferTypeRole = TreeModel::UserRole, ItemActiveRole, BufferActivityRole, @@ -294,7 +331,8 @@ public: MarkerLineMsgIdRole, }; - enum ItemType { + enum ItemType + { NetworkItemType = 0x01, BufferItemType = 0x02, UserCategoryItemType = 0x04, @@ -302,25 +340,25 @@ public: }; Q_DECLARE_FLAGS(ItemTypes, ItemType) - NetworkModel(QObject *parent = 0); + NetworkModel(QObject* parent = nullptr); static QList defaultHeader(); - static bool mimeContainsBufferList(const QMimeData *mimeData); - static QList > mimeDataToBufferList(const QMimeData *mimeData); + static bool mimeContainsBufferList(const QMimeData* mimeData); + static QList> mimeDataToBufferList(const QMimeData* mimeData); - virtual QStringList mimeTypes() const; - virtual QMimeData *mimeData(const QModelIndexList &) const; + QStringList mimeTypes() const override; + QMimeData* mimeData(const QModelIndexList&) const override; - void attachNetwork(Network *network); + void attachNetwork(Network* network); - bool isBufferIndex(const QModelIndex &) const; - //Buffer *getBufferByIndex(const QModelIndex &) const; + bool isBufferIndex(const QModelIndex&) const; + // Buffer *getBufferByIndex(const QModelIndex &) const; QModelIndex networkIndex(NetworkId networkId); QModelIndex bufferIndex(BufferId bufferId); - const Network *networkByIndex(const QModelIndex &index) const; + const Network* networkByIndex(const QModelIndex& index) const; - BufferInfo::ActivityLevel bufferActivity(const BufferInfo &buffer) const; + BufferInfo::ActivityLevel bufferActivity(const BufferInfo& buffer) const; //! Finds a buffer with a given name in a given network /** This performs a linear search through all BufferItems, hence it is expensive. @@ -328,7 +366,7 @@ public: * @param bufferName The bufferName we look for * @return The id of the buffer if found, an invalid one else */ - BufferId bufferId(NetworkId networkId, const QString &bufferName, Qt::CaseSensitivity cs = Qt::CaseInsensitive) const; + BufferId bufferId(NetworkId networkId, const QString& bufferName, Qt::CaseSensitivity cs = Qt::CaseInsensitive) const; QString bufferName(BufferId bufferId) const; BufferInfo::Type bufferType(BufferId bufferId) const; @@ -340,18 +378,20 @@ public: inline QList allBufferIds() const { return _bufferItemCache.keys(); } QList allBufferIdsSorted() const; - void sortBufferIds(QList &bufferIds) const; + void sortBufferIds(QList& bufferIds) const; public slots: void bufferUpdated(BufferInfo bufferInfo); void removeBuffer(BufferId bufferId); - MsgId lastSeenMsgId(const BufferId &bufferId); - void setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId); - void setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msgId); - void setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel activity); - void clearBufferActivity(const BufferId &bufferId); - void updateBufferActivity(Message &msg); - void networkRemoved(const NetworkId &networkId); + MsgId lastSeenMsgId(const BufferId& bufferId); + void setLastSeenMsgId(const BufferId& bufferId, const MsgId& msgId); + void setMarkerLineMsgId(const BufferId& bufferId, const MsgId& msgId); + void setBufferActivity(const BufferId& bufferId, BufferInfo::ActivityLevel activity); + void clearBufferActivity(const BufferId& bufferId); + void updateBufferActivity(Message& msg); + void networkRemoved(const NetworkId& networkId); + void bufferActivityChanged(BufferId, Message::Types); + void highlightCountChanged(BufferId, int); signals: void requestSetLastSeenMsg(BufferId buffer, MsgId msg); @@ -359,30 +399,27 @@ signals: void markerLineSet(BufferId buffer, MsgId msg); private slots: - void checkForRemovedBuffers(const QModelIndex &parent, int start, int end); - void checkForNewBuffers(const QModelIndex &parent, int start, int end); + void checkForRemovedBuffers(const QModelIndex& parent, int start, int end); + void checkForNewBuffers(const QModelIndex& parent, int start, int end); void messageRedirectionSettingsChanged(); private: int networkRow(NetworkId networkId) const; - NetworkItem *findNetworkItem(NetworkId networkId) const; - NetworkItem *networkItem(NetworkId networkId); - inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) const { return findBufferItem(bufferInfo.bufferId()); } - BufferItem *findBufferItem(BufferId bufferId) const; - BufferItem *bufferItem(const BufferInfo &bufferInfo); + NetworkItem* findNetworkItem(NetworkId networkId) const; + NetworkItem* networkItem(NetworkId networkId); + inline BufferItem* findBufferItem(const BufferInfo& bufferInfo) const { return findBufferItem(bufferInfo.bufferId()); } + BufferItem* findBufferItem(BufferId bufferId) const; + BufferItem* bufferItem(const BufferInfo& bufferInfo); - void updateBufferActivity(BufferItem *bufferItem, const Message &msg); + void updateBufferActivity(BufferItem* bufferItem, const Message& msg); - static bool bufferItemLessThan(const BufferItem *left, const BufferItem *right); + static bool bufferItemLessThan(const BufferItem* left, const BufferItem* right); - QHash _bufferItemCache; + QHash _bufferItemCache; int _userNoticesTarget; int _serverNoticesTarget; int _errorMsgsTarget; }; - Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::ItemTypes) - -#endif // NETWORKMODEL_H