X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=6fd078e2aef6ae7e3fe9d0e9becb4c9edd919334;hp=07b219024ff1fc79efff9763849fc2c1408889df;hb=7ea9c498bfb975a95c11d6ddc28835840cf3353d;hpb=761a147545864782a79570dbaf8f4cc25de7423d diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h index 07b21902..6fd078e2 100644 --- a/src/client/networkmodel.h +++ b/src/client/networkmodel.h @@ -21,24 +21,12 @@ #ifndef NETWORKMODEL_H #define NETWORKMODEL_H -#include - -#include "treemodel.h" -#include "buffer.h" - -#include - -class BufferInfo; - -#include "selectionmodelsynchronizer.h" -#include "modelpropertymapper.h" +#include "bufferinfo.h" #include "clientsettings.h" -#include "ircchannel.h" -#include "ircuser.h" +#include "message.h" #include "network.h" +#include "treemodel.h" -class MappedSelectionModel; -class QAbstractItemView; class BufferItem; /***************************************** @@ -49,7 +37,7 @@ class NetworkItem : public PropertyMapItem { Q_PROPERTY(QString networkName READ networkName) Q_PROPERTY(QString currentServer READ currentServer) Q_PROPERTY(int nickCount READ nickCount) - + public: NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0); @@ -108,14 +96,15 @@ public: virtual inline bool isActive() const { return qobject_cast(parent())->isActive(); } - inline Buffer::ActivityLevel activityLevel() const { return _activity; } - void setActivityLevel(Buffer::ActivityLevel level); - void updateActivityLevel(Buffer::ActivityLevel level); - - void setLastMsgInsert(QDateTime msgDate); - bool setLastSeen(); - QDateTime lastSeen(); + inline const MsgId &lastSeenMsgId() const { return _lastSeenMsgId; } + inline const MsgId &lastSeenMarkerMsgId() const { return _lastSeenMarkerMsgId; } + void setLastSeenMsgId(const MsgId &msgId); + inline BufferInfo::ActivityLevel activityLevel() const { return _activity; } + void setActivityLevel(BufferInfo::ActivityLevel level); + void clearActivityLevel(); + void updateActivityLevel(const Message &msg); + bool isCurrentBuffer() const; virtual QString toolTip(int column) const; public slots: @@ -123,7 +112,9 @@ public slots: private: BufferInfo _bufferInfo; - Buffer::ActivityLevel _activity; + BufferInfo::ActivityLevel _activity; + MsgId _lastSeenMsgId; + MsgId _lastSeenMarkerMsgId; }; /***************************************** @@ -154,7 +145,7 @@ public: public slots: void attachIrcUser(IrcUser *ircUser); - void ircUserDestroyed(); + void ircUserQuited(); private: IrcUser *_ircUser; @@ -171,12 +162,13 @@ class ChannelBufferItem : public BufferItem { public: ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent); + virtual QVariant data(int column, int role) const; virtual inline bool isActive() const { return (bool)_ircChannel; } virtual QString toolTip(int column) const; 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); public slots: @@ -190,7 +182,7 @@ public slots: void userModeChanged(IrcUser *ircUser); private slots: - void ircChannelDestroyed(); + void ircChannelParted(); private: IrcChannel *_ircChannel; @@ -203,7 +195,7 @@ class IrcUserItem; class UserCategoryItem : public PropertyMapItem { Q_OBJECT Q_PROPERTY(QString categoryName READ categoryName) - + public: UserCategoryItem(int category, AbstractTreeItem *parent); @@ -229,7 +221,7 @@ private: class IrcUserItem : public PropertyMapItem { Q_OBJECT Q_PROPERTY(QString nickName READ nickName) - + public: IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent); @@ -241,7 +233,7 @@ public: virtual QString toolTip(int column) const; private slots: - inline void ircUserDestroyed() { parent()->removeChild(this); } + inline void ircUserQuited() { parent()->removeChild(this); } private: QPointer _ircUser; @@ -255,7 +247,7 @@ class NetworkModel : public TreeModel { Q_OBJECT public: - enum myRoles { + enum Role { BufferTypeRole = TreeModel::UserRole, ItemActiveRole, BufferActivityRole, @@ -263,16 +255,18 @@ public: NetworkIdRole, BufferInfoRole, ItemTypeRole, - UserAwayRole + UserAwayRole, + IrcUserRole, + IrcChannelRole }; - enum itemType { + enum ItemType { NetworkItemType = 0x01, BufferItemType = 0x02, UserCategoryItemType = 0x04, IrcUserItemType = 0x08 }; - Q_DECLARE_FLAGS(itemTypes, itemType); + Q_DECLARE_FLAGS(ItemTypes, ItemType) NetworkModel(QObject *parent = 0); static QList defaultHeader(); @@ -293,33 +287,52 @@ public: const Network *networkByIndex(const QModelIndex &index) const; - Buffer::ActivityLevel bufferActivity(const BufferInfo &buffer) const; + BufferInfo::ActivityLevel bufferActivity(const BufferInfo &buffer) const; - QString bufferName(BufferId bufferId); - NetworkId networkId(BufferId bufferId); - QString networkName(BufferId bufferId); - BufferInfo::Type bufferType(BufferId bufferId); + //! Finds a buffer with a given name in a given network + /** This performs a linear search through all BufferItems, hence it is expensive. + * @param networkId The network which we search in + * @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; + + QString bufferName(BufferId bufferId) const; + BufferInfo::Type bufferType(BufferId bufferId) const; + BufferInfo bufferInfo(BufferId bufferId) const; + MsgId lastSeenMsgId(BufferId bufferId) const; + MsgId lastSeenMarkerMsgId(BufferId bufferId) const; + NetworkId networkId(BufferId bufferId) const; + QString networkName(BufferId bufferId) const; + + inline QList allBufferIds() const { return _bufferItemCache.keys(); } public slots: void bufferUpdated(BufferInfo bufferInfo); void removeBuffer(BufferId bufferId); - void setBufferActivity(const BufferInfo &buffer, Buffer::ActivityLevel activity); + void setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId); + void setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel activity); + void clearBufferActivity(const BufferId &bufferId); + void updateBufferActivity(const Message &msg); void networkRemoved(const NetworkId &networkId); +signals: + void setLastSeenMsg(BufferId bufferId, MsgId msgId); + private slots: void checkForRemovedBuffers(const QModelIndex &parent, int start, int end); void checkForNewBuffers(const QModelIndex &parent, int start, int end); private: - int networkRow(NetworkId networkId); - NetworkItem *findNetworkItem(NetworkId networkId); + int networkRow(NetworkId networkId) const; + NetworkItem *findNetworkItem(NetworkId networkId) const; NetworkItem *networkItem(NetworkId networkId); - BufferItem *findBufferItem(const BufferInfo &bufferInfo); - BufferItem *findBufferItem(BufferId bufferId); + inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) const { return findBufferItem(bufferInfo.bufferId()); } + BufferItem *findBufferItem(BufferId bufferId) const; BufferItem *bufferItem(const BufferInfo &bufferInfo); QHash _bufferItemCache; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes); +Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::ItemTypes) #endif // NETWORKMODEL_H