projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Fixed "ghost-buffers" appearing in the network view
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
959d89a
..
208503c
100644
(file)
--- a/
src/client/networkmodel.h
+++ b/
src/client/networkmodel.h
@@
-45,7
+45,7
@@
class IrcUser;
*****************************************/
class BufferItem : public PropertyMapItem {
Q_OBJECT
*****************************************/
class BufferItem : public PropertyMapItem {
Q_OBJECT
- Q_PROPERTY(QString bufferName READ bufferName)
+ Q_PROPERTY(QString bufferName READ bufferName
WRITE setBufferName
)
Q_PROPERTY(QString topic READ topic)
Q_PROPERTY(int nickCount READ nickCount)
Q_PROPERTY(QString topic READ topic)
Q_PROPERTY(int nickCount READ nickCount)
@@
-60,36
+60,25
@@
public:
void attachIrcChannel(IrcChannel *ircChannel);
QString bufferName() const;
void attachIrcChannel(IrcChannel *ircChannel);
QString bufferName() const;
+ void setBufferName(const QString &name);
QString topic() const;
int nickCount() 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;
-
- enum Activity {
- NoActivity = 0x00,
- OtherActivity = 0x01,
- NewMessage = 0x02,
- Highlight = 0x40
- };
- Q_DECLARE_FLAGS(ActivityLevel, Activity)
- ActivityLevel activity() const;
- bool setActivity
(const ActivityLevel &
level);
- void updateActivity
(const ActivityLevel &
level);
+ inline Buffer::ActivityLevel activityLevel() const { return _activity; }
+ bool setActivity
Level(Buffer::ActivityLevel
level);
+ void updateActivity
Level(Buffer::ActivityLevel
level);
void setLastMsgInsert(QDateTime msgDate);
bool setLastSeen();
QDateTime lastSeen();
void setLastMsgInsert(QDateTime msgDate);
bool setLastSeen();
QDateTime lastSeen();
+ virtual QString toolTip(int column) const;
+
public slots:
void setTopic(const QString &topic);
void join(IrcUser *ircUser);
public slots:
void setTopic(const QString &topic);
void join(IrcUser *ircUser);
@@
-98,20
+87,19
@@
public slots:
void addUserToCategory(IrcUser *ircUser);
void removeUserFromCategory(IrcUser *ircUser);
void userModeChanged(IrcUser *ircUser);
void addUserToCategory(IrcUser *ircUser);
void removeUserFromCategory(IrcUser *ircUser);
void userModeChanged(IrcUser *ircUser);
-
+
private slots:
void ircChannelDestroyed();
private slots:
void ircChannelDestroyed();
-
+ void ircUserDestroyed();
+
private:
BufferInfo _bufferInfo;
private:
BufferInfo _bufferInfo;
- ActivityLevel _activity;
- Type _type;
- QDateTime _lastMsgInsert;
- QDateTime _lastSeen;
+ QString _bufferName;
+ Buffer::ActivityLevel _activity;
QPointer<IrcChannel> _ircChannel;
};
QPointer<IrcChannel> _ircChannel;
};
-Q_DECLARE_OPERATORS_FOR_FLAGS(BufferItem::ActivityLevel)
+
/*****************************************
* Network Items
/*****************************************
* Network Items
@@
-126,14
+114,17
@@
public:
NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
virtual quint64 id() const;
NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
virtual quint64 id() const;
+ inline const NetworkId &networkId() const { return _networkId; }
virtual QVariant data(int column, int row) const;
bool isActive() const;
virtual QVariant data(int column, int row) const;
bool isActive() const;
-
+
QString networkName() const;
QString currentServer() const;
int nickCount() const;
QString networkName() const;
QString currentServer() const;
int nickCount() const;
-
+
+ virtual QString toolTip(int column) const;
+
public slots:
void setNetworkName(const QString &networkName);
void setCurrentServer(const QString &serverName);
public slots:
void setNetworkName(const QString &networkName);
void setCurrentServer(const QString &serverName);
@@
-141,8
+132,6
@@
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;
@@
-191,16
+180,20
@@
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;
virtual QVariant data(int column, int role) const;
virtual QString toolTip(int column) const;
IrcUser *ircUser();
virtual quint64 id() 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 setAway(bool);
private:
private:
- IrcUser *_ircUser;
+ QPointer<IrcUser> _ircUser;
+ quint64 _id;
};
};
@@
-218,8
+211,7
@@
public:
BufferIdRole,
NetworkIdRole,
BufferInfoRole,
BufferIdRole,
NetworkIdRole,
BufferInfoRole,
- ItemTypeRole,
- LastSeenRole
+ ItemTypeRole
};
enum itemTypes {
};
enum itemTypes {
@@
-228,7
+220,7
@@
public:
UserCategoryItemType,
IrcUserItemType
};
UserCategoryItemType,
IrcUserItemType
};
-
+
NetworkModel(QObject *parent = 0);
static QList<QVariant> defaultHeader();
NetworkModel(QObject *parent = 0);
static QList<QVariant> defaultHeader();
@@
-247,10
+239,14
@@
public:
const Network *networkByIndex(const QModelIndex &index) const;
const Network *networkByIndex(const QModelIndex &index) const;
+ Buffer::ActivityLevel bufferActivity(const BufferInfo &buffer) const;
+
public slots:
void bufferUpdated(BufferInfo bufferInfo);
public slots:
void bufferUpdated(BufferInfo bufferInfo);
- void updateBufferActivity(const Message &msg);
-
+ void removeBuffer(BufferId bufferId);
+ void setBufferActivity(const BufferInfo &buffer, Buffer::ActivityLevel activity);
+ void networkRemoved(const NetworkId &networkId);
+
private:
QModelIndex networkIndex(NetworkId networkId);
NetworkItem *networkItem(NetworkId networkId);
private:
QModelIndex networkIndex(NetworkId networkId);
NetworkItem *networkItem(NetworkId networkId);