projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- MessageTypes are now binary exclusive which allows easy checks with multimple condi...
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
2946872
..
8c36233
100644
(file)
--- a/
src/client/networkmodel.h
+++ b/
src/client/networkmodel.h
@@
-32,6
+32,8
@@
class BufferInfo;
#include "selectionmodelsynchronizer.h"
#include "modelpropertymapper.h"
#include "selectionmodelsynchronizer.h"
#include "modelpropertymapper.h"
+#include "clientsettings.h"
+
class MappedSelectionModel;
class QAbstractItemView;
class Network;
class MappedSelectionModel;
class QAbstractItemView;
class Network;
@@
-53,21
+55,16
@@
public:
const BufferInfo &bufferInfo() const;
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
const BufferInfo &bufferInfo() const;
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
+ virtual bool setData(int column, const QVariant &value, int role);
void attachIrcChannel(IrcChannel *ircChannel);
QString bufferName() const;
QString topic() const;
int nickCount() const;
void attachIrcChannel(IrcChannel *ircChannel);
QString bufferName() const;
QString topic() const;
int nickCount() const;
-
- enum Type {
- StatusType,
- ChannelType,
- QueryType
- };
bool isStatusBuffer() const;
bool isStatusBuffer() const;
- Type bufferType() const;
+
BufferInfo::
Type bufferType() const;
bool isActive() const;
bool isActive() const;
@@
-80,8
+77,12
@@
public:
Q_DECLARE_FLAGS(ActivityLevel, Activity)
ActivityLevel activity() const;
Q_DECLARE_FLAGS(ActivityLevel, Activity)
ActivityLevel activity() const;
- void setActivity(const ActivityLevel &level);
- void addActivity(const ActivityLevel &level);
+ bool setActivity(const ActivityLevel &level);
+ void updateActivity(const ActivityLevel &level);
+
+ void setLastMsgInsert(QDateTime msgDate);
+ bool setLastSeen();
+ QDateTime lastSeen();
public slots:
void setTopic(const QString &topic);
public slots:
void setTopic(const QString &topic);
@@
-94,11
+95,13
@@
public slots:
private slots:
void ircChannelDestroyed();
private slots:
void ircChannelDestroyed();
+ void ircUserDestroyed();
private:
BufferInfo _bufferInfo;
ActivityLevel _activity;
private:
BufferInfo _bufferInfo;
ActivityLevel _activity;
- Type _type;
+ QDateTime _lastMsgInsert;
+ QDateTime _lastSeen;
QPointer<IrcChannel> _ircChannel;
};
QPointer<IrcChannel> _ircChannel;
};
@@
-116,8
+119,8
@@
class NetworkItem : public PropertyMapItem {
public:
NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
public:
NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
- virtual QVariant data(int column, int row) const;
virtual quint64 id() const;
virtual quint64 id() const;
+ virtual QVariant data(int column, int row) const;
bool isActive() const;
bool isActive() const;
@@
-131,6
+134,8
@@
public slots:
void attachNetwork(Network *network);
void attachIrcChannel(const QString &channelName);
void attachNetwork(Network *network);
void attachIrcChannel(const QString &channelName);
+
+ void setActive(bool connected);
private:
NetworkId _networkId;
private:
NetworkId _networkId;
@@
-150,8
+155,10
@@
public:
QString categoryId();
virtual quint64 id() const;
QString categoryId();
virtual quint64 id() const;
-
+ virtual QVariant data(int column, int role) const;
+
void addUser(IrcUser *ircUser);
void addUser(IrcUser *ircUser);
+ bool removeUser(IrcUser *ircUser);
static int categoryFromModes(const QString &modes);
static int categoryFromModes(const QString &modes);
@@
-178,18
+185,19
@@
public:
IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
QString nickName() const;
IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
QString nickName() const;
+ bool isActive() const;
+
IrcUser *ircUser();
virtual quint64 id() const;
IrcUser *ircUser();
virtual quint64 id() const;
-
virtual QVariant data(int column, int role) const;
virtual QVariant data(int column, int role) const;
-
-
+ virtual QString toolTip(int column) const;
+
private slots:
void setNick(QString newNick);
private slots:
void setNick(QString newNick);
- void ircUserDestroyed();
private:
private:
- IrcUser *_ircUser;
+ QPointer<IrcUser> _ircUser;
+ quint64 _id;
};
};
@@
-203,17
+211,19
@@
public:
enum myRoles {
BufferTypeRole = Qt::UserRole,
ItemActiveRole,
enum myRoles {
BufferTypeRole = Qt::UserRole,
ItemActiveRole,
+ BufferActivityRole,
BufferIdRole,
NetworkIdRole,
BufferIdRole,
NetworkIdRole,
- ItemTypeRole
+ BufferInfoRole,
+ ItemTypeRole,
+ LastSeenRole
};
enum itemTypes {
};
enum itemTypes {
- AbstractItemType,
- SimpleItemType,
NetworkItemType,
BufferItemType,
NetworkItemType,
BufferItemType,
- NickItemType
+ UserCategoryItemType,
+ IrcUserItemType
};
NetworkModel(QObject *parent = 0);
};
NetworkModel(QObject *parent = 0);
@@
-232,10
+242,13
@@
public:
//Buffer *getBufferByIndex(const QModelIndex &) const;
QModelIndex bufferIndex(BufferId bufferId);
//Buffer *getBufferByIndex(const QModelIndex &) const;
QModelIndex bufferIndex(BufferId bufferId);
+ const Network *networkByIndex(const QModelIndex &index) const;
+
public slots:
void bufferUpdated(BufferInfo bufferInfo);
public slots:
void bufferUpdated(BufferInfo bufferInfo);
- void bufferActivity(BufferItem::ActivityLevel, BufferInfo bufferInfo);
-
+ void updateBufferActivity(const Message &msg);
+ void networkRemoved(const NetworkId &networkId);
+
private:
QModelIndex networkIndex(NetworkId networkId);
NetworkItem *networkItem(NetworkId networkId);
private:
QModelIndex networkIndex(NetworkId networkId);
NetworkItem *networkItem(NetworkId networkId);