X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=d61798651bab869ccf73d9d12ed3761a487600fd;hp=117bbd78c8f10001c5aab4ae86a2456c7b5fcad7;hb=adff595449304996ee1a5b21f9ee768f83e0a4b1;hpb=332069a1830ed3a055ac6f2d7661bae1cc83e40c diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h index 117bbd78..d6179865 100644 --- a/src/client/networkmodel.h +++ b/src/client/networkmodel.h @@ -110,10 +110,11 @@ public: virtual inline bool isActive() const { return qobject_cast(parent())->isActive(); } inline const MsgId &lastSeenMsgId() const { return _lastSeenMsgId; } - inline void setLastSeenMsgId(const MsgId &msgId) { _lastSeenMsgId = msgId; } + 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 updateActivityLevel(BufferInfo::ActivityLevel level); + void clearActivityLevel(); void updateActivityLevel(const Message &msg); bool isCurrentBuffer() const; @@ -126,6 +127,7 @@ private: BufferInfo _bufferInfo; BufferInfo::ActivityLevel _activity; MsgId _lastSeenMsgId; + MsgId _lastSeenMarkerMsgId; }; /***************************************** @@ -274,7 +276,7 @@ public: UserCategoryItemType = 0x04, IrcUserItemType = 0x08 }; - Q_DECLARE_FLAGS(itemTypes, itemType); + Q_DECLARE_FLAGS(itemTypes, itemType) NetworkModel(QObject *parent = 0); static QList defaultHeader(); @@ -301,6 +303,7 @@ public: BufferInfo::Type bufferType(BufferId bufferId); BufferInfo bufferInfo(BufferId bufferId); MsgId lastSeenMsgId(BufferId bufferId); + MsgId lastSeenMarkerMsgId(BufferId bufferId); NetworkId networkId(BufferId bufferId); QString networkName(BufferId bufferId); @@ -311,9 +314,13 @@ public slots: void removeBuffer(BufferId bufferId); 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); @@ -328,6 +335,6 @@ private: QHash _bufferItemCache; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes); +Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes) #endif // NETWORKMODEL_H