projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the nickselector should now react properly to any relevant changes (aka nickchanges...
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
2946872
..
b038f9d
100644
(file)
--- a/
src/client/networkmodel.h
+++ b/
src/client/networkmodel.h
@@
-53,6
+53,7
@@
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);
void attachIrcChannel(IrcChannel *ircChannel);
@@
-81,7
+82,7
@@
public:
ActivityLevel activity() const;
void setActivity(const ActivityLevel &level);
ActivityLevel activity() const;
void setActivity(const ActivityLevel &level);
- void
add
Activity(const ActivityLevel &level);
+ void
update
Activity(const ActivityLevel &level);
public slots:
void setTopic(const QString &topic);
public slots:
void setTopic(const QString &topic);
@@
-116,8
+117,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
+132,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
+153,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);
@@
-180,13
+185,11
@@
public:
QString nickName() const;
IrcUser *ircUser();
virtual quint64 id() const;
QString nickName() 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:
IrcUser *_ircUser;
private:
IrcUser *_ircUser;
@@
-203,17
+206,18
@@
public:
enum myRoles {
BufferTypeRole = Qt::UserRole,
ItemActiveRole,
enum myRoles {
BufferTypeRole = Qt::UserRole,
ItemActiveRole,
+ BufferActivityRole,
BufferIdRole,
NetworkIdRole,
BufferIdRole,
NetworkIdRole,
+ BufferInfoRole,
ItemTypeRole
};
enum itemTypes {
ItemTypeRole
};
enum itemTypes {
- AbstractItemType,
- SimpleItemType,
NetworkItemType,
BufferItemType,
NetworkItemType,
BufferItemType,
- NickItemType
+ UserCategoryItemType,
+ IrcUserItemType
};
NetworkModel(QObject *parent = 0);
};
NetworkModel(QObject *parent = 0);
@@
-232,9
+236,11
@@
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
);
private:
QModelIndex networkIndex(NetworkId networkId);
private:
QModelIndex networkIndex(NetworkId networkId);