projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introducing the first shiny stuff for our new event-based core backend
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
251ba77
..
daf8243
100644
(file)
--- a/
src/client/networkmodel.h
+++ b/
src/client/networkmodel.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-28,6
+28,7
@@
#include "treemodel.h"
class BufferItem;
#include "treemodel.h"
class BufferItem;
+class StatusBufferItem;
/*****************************************
* Network Items
/*****************************************
* Network Items
@@
-55,6
+56,7
@@
public:
BufferItem *findBufferItem(BufferId bufferId);
inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); }
BufferItem *bufferItem(const BufferInfo &bufferInfo);
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);
public slots:
void setNetworkName(const QString &networkName);
@@
-67,8
+69,12
@@
public slots:
signals:
void networkDataChanged(int column = -1);
signals:
void networkDataChanged(int column = -1);
+private slots:
+ void onBeginRemoveChilds(int start, int end);
+
private:
NetworkId _networkId;
private:
NetworkId _networkId;
+ StatusBufferItem *_statusBufferItem;
QPointer<Network> _network;
};
QPointer<Network> _network;
};
@@
-99,14
+105,18
@@
public:
virtual inline bool isActive() const { return qobject_cast<NetworkItem *>(parent())->isActive(); }
virtual inline bool isActive() const { return qobject_cast<NetworkItem *>(parent())->isActive(); }
- inline const MsgId &lastSeenMsgId() const { return _lastSeenMsgId; }
- inline const MsgId &lastSeenMarkerMsgId() const { return _lastSeenMarkerMsgId; }
- void setLastSeenMsgId(const MsgId &msgId);
+ inline MsgId lastSeenMsgId() const { return _lastSeenMsgId; }
+ inline MsgId markerLineMsgId() const { return _markerLineMsgId; }
+ void setLastSeenMsgId(MsgId msgId);
+ void setMarkerLineMsgId(MsgId msgId);
+
inline BufferInfo::ActivityLevel activityLevel() const { return _activity; }
void setActivityLevel(BufferInfo::ActivityLevel level);
void clearActivityLevel();
void updateActivityLevel(const Message &msg);
inline BufferInfo::ActivityLevel activityLevel() const { return _activity; }
void setActivityLevel(BufferInfo::ActivityLevel level);
void clearActivityLevel();
void updateActivityLevel(const Message &msg);
+ inline const MsgId &firstUnreadMsgId() const { return _firstUnreadMsgId; }
+
bool isCurrentBuffer() const;
virtual QString toolTip(int column) const;
bool isCurrentBuffer() const;
virtual QString toolTip(int column) const;
@@
-117,7
+127,8
@@
private:
BufferInfo _bufferInfo;
BufferInfo::ActivityLevel _activity;
MsgId _lastSeenMsgId;
BufferInfo _bufferInfo;
BufferInfo::ActivityLevel _activity;
MsgId _lastSeenMsgId;
- MsgId _lastSeenMarkerMsgId;
+ MsgId _markerLineMsgId;
+ MsgId _firstUnreadMsgId;
};
/*****************************************
};
/*****************************************
@@
-264,7
+275,9
@@
public:
ItemTypeRole,
UserAwayRole,
IrcUserRole,
ItemTypeRole,
UserAwayRole,
IrcUserRole,
- IrcChannelRole
+ IrcChannelRole,
+ BufferFirstUnreadMsgIdRole,
+ MarkerLineMsgIdRole,
};
enum ItemType {
};
enum ItemType {
@@
-307,7
+320,7
@@
public:
BufferInfo::Type bufferType(BufferId bufferId) const;
BufferInfo bufferInfo(BufferId bufferId) const;
MsgId lastSeenMsgId(BufferId bufferId) const;
BufferInfo::Type bufferType(BufferId bufferId) const;
BufferInfo bufferInfo(BufferId bufferId) const;
MsgId lastSeenMsgId(BufferId bufferId) const;
- MsgId
lastSeenMarker
MsgId(BufferId bufferId) const;
+ MsgId
markerLine
MsgId(BufferId bufferId) const;
NetworkId networkId(BufferId bufferId) const;
QString networkName(BufferId bufferId) const;
NetworkId networkId(BufferId bufferId) const;
QString networkName(BufferId bufferId) const;
@@
-318,18
+331,23
@@
public:
public slots:
void bufferUpdated(BufferInfo bufferInfo);
void removeBuffer(BufferId bufferId);
public slots:
void bufferUpdated(BufferInfo bufferInfo);
void removeBuffer(BufferId bufferId);
+ MsgId lastSeenMsgId(const BufferId &bufferId);
void setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId);
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 setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel activity);
void clearBufferActivity(const BufferId &bufferId);
- void updateBufferActivity(
const
Message &msg);
+ void updateBufferActivity(Message &msg);
void networkRemoved(const NetworkId &networkId);
signals:
void networkRemoved(const NetworkId &networkId);
signals:
- void setLastSeenMsg(BufferId bufferId, MsgId msgId);
+ void requestSetLastSeenMsg(BufferId buffer, MsgId msg);
+ void lastSeenMsgSet(BufferId buffer, MsgId msg);
+ 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);
private slots:
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;
private:
int networkRow(NetworkId networkId) const;
@@
-339,9
+357,15
@@
private:
BufferItem *findBufferItem(BufferId bufferId) const;
BufferItem *bufferItem(const BufferInfo &bufferInfo);
BufferItem *findBufferItem(BufferId bufferId) const;
BufferItem *bufferItem(const BufferInfo &bufferInfo);
+ void updateBufferActivity(BufferItem *bufferItem, const Message &msg);
+
static bool bufferItemLessThan(const BufferItem *left, const BufferItem *right);
QHash<BufferId, BufferItem *> _bufferItemCache;
static bool bufferItemLessThan(const BufferItem *left, const BufferItem *right);
QHash<BufferId, BufferItem *> _bufferItemCache;
+
+ int _userNoticesTarget;
+ int _serverNoticesTarget;
+ int _errorMsgsTarget;
};
Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::ItemTypes)
};
Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::ItemTypes)