#include <QAbstractItemView>
-#include "bufferinfo.h"
+#include "buffermodel.h"
#include "client.h"
#include "signalproxy.h"
#include "network.h"
: PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
_networkId(netid)
{
- setFlags(Qt::ItemIsEnabled);
+ setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
}
QVariant NetworkItem::data(int column, int role) const {
switch(role) {
+ case NetworkModel::BufferIdRole:
+ case NetworkModel::BufferInfoRole:
+ case NetworkModel::BufferTypeRole:
+ if(childCount())
+ return child(0)->data(column, role);
+ else
+ return QVariant();
case NetworkModel::NetworkIdRole:
return qVariantFromValue(_networkId);
case NetworkModel::ItemTypeRole:
BufferItem *NetworkItem::findBufferItem(BufferId bufferId) {
BufferItem *bufferItem = 0;
-
+
for(int i = 0; i < childCount(); i++) {
bufferItem = qobject_cast<BufferItem *>(child(i));
if(!bufferItem)
BufferItem *bufferItem = findBufferItem(bufferInfo);
if(bufferItem)
return bufferItem;
-
+
switch(bufferInfo.type()) {
case BufferInfo::StatusBuffer:
bufferItem = new StatusBufferItem(bufferInfo, this);
void NetworkItem::attachNetwork(Network *network) {
if(!network)
return;
-
+
_network = network;
connect(network, SIGNAL(networkNameSet(QString)),
this, SIGNAL(dataChanged()));
connect(network, SIGNAL(destroyed()),
this, SIGNAL(dataChanged()));
-
+
emit dataChanged();
}
Q_UNUSED(column);
QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
- toolTip.append(QString("Server: %1").arg(currentServer()));
- toolTip.append(QString("Users: %1").arg(nickCount()));
+ toolTip.append(tr("Server: %1").arg(currentServer()));
+ toolTip.append(tr("Users: %1").arg(nickCount()));
if(_network) {
- toolTip.append(QString("Lag: %1 msecs").arg(_network->latency()));
+ toolTip.append(tr("Lag: %1 msecs").arg(_network->latency()));
}
return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
BufferItem::BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent)
: PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
_bufferInfo(bufferInfo),
- _activity(Buffer::NoActivity)
+ _activity(BufferInfo::NoActivity)
{
setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
}
-void BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
+void BufferItem::setActivityLevel(BufferInfo::ActivityLevel level) {
if(_activity != level) {
_activity = level;
emit dataChanged();
}
}
-void BufferItem::updateActivityLevel(Buffer::ActivityLevel level) {
- Buffer::ActivityLevel oldActivity = _activity;
- _activity |= level;
- if(oldActivity != _activity)
+void BufferItem::clearActivityLevel() {
+ _activity = BufferInfo::NoActivity;
+ _lastSeenMarkerMsgId = _lastSeenMsgId;
+ emit dataChanged();
+}
+
+void BufferItem::updateActivityLevel(const Message &msg) {
+ if(isCurrentBuffer()) {
+ return;
+ }
+
+ if(msg.flags() & Message::Self) // don't update activity for our own messages
+ return;
+
+ if(lastSeenMsgId() >= msg.msgId())
+ return;
+
+ BufferInfo::ActivityLevel oldLevel = activityLevel();
+
+ _activity |= BufferInfo::OtherActivity;
+ if(msg.type() & (Message::Plain | Message::Notice | Message::Action))
+ _activity |= BufferInfo::NewMessage;
+
+ if(msg.flags() & Message::Highlight)
+ _activity |= BufferInfo::Highlight;
+
+ if(oldLevel != _activity)
emit dataChanged();
}
qDebug() << "BufferItem::setData(int column, const QVariant &value, int role):" << this << column << value << role;
switch(role) {
case NetworkModel::BufferActivityRole:
- setActivityLevel((Buffer::ActivityLevel)value.toInt());
+ setActivityLevel((BufferInfo::ActivityLevel)value.toInt());
return true;
default:
return PropertyMapItem::setData(column, value, role);
emit dataChanged(0);
}
-QString BufferItem::toolTip(int column) const {
- Q_UNUSED(column);
- return tr("<p> %1 - %2 </p>").arg(bufferInfo().bufferId().toInt()).arg(bufferName());
+void BufferItem::setLastSeenMsgId(const MsgId &msgId) {
+ _lastSeenMsgId = msgId;
+ if(!isCurrentBuffer()) {
+ _lastSeenMarkerMsgId = msgId;
+ }
+ setActivityLevel(BufferInfo::NoActivity);
}
-/*
-void BufferItem::setLastMsgInsert(QDateTime msgDate) {
- if(msgDate.isValid() && msgDate > _lastMsgInsert)
- _lastMsgInsert = msgDate;
-}
-*/
-/*
-// FIXME emit dataChanged()
-bool BufferItem::setLastSeen() {
- if(_lastSeen > _lastMsgInsert)
- return false;
-
- _lastSeen = _lastMsgInsert;
- BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen);
- return true;
+bool BufferItem::isCurrentBuffer() const {
+ return _bufferInfo.bufferId() == Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
}
-QDateTime BufferItem::lastSeen() {
- return _lastSeen;
+QString BufferItem::toolTip(int column) const {
+ Q_UNUSED(column);
+ return tr("<p> %1 - %2 </p>").arg(bufferInfo().bufferId().toInt()).arg(bufferName());
}
-*/
/*****************************************
* StatusBufferItem
}
QString QueryBufferItem::toolTip(int column) const {
- // pretty much code duplication of IrcUserItem::toolTip() but inheritance won't solve this...
+ // pretty much code duplication of IrcUserItem::toolTip() but inheritance won't solve this...
Q_UNUSED(column);
QStringList toolTip;
if(!_ircUser->ircOperator().isEmpty()) toolTip.append(QString("%1 %2").arg(_ircUser->nick()).arg(_ircUser->ircOperator()));
if(!_ircUser->suserHost().isEmpty()) toolTip.append(_ircUser->suserHost());
if(!_ircUser->whoisServiceReply().isEmpty()) toolTip.append(_ircUser->whoisServiceReply());
-
+
toolTip.append(_ircUser->hostmask().remove(0, _ircUser->hostmask().indexOf("!")+1));
-
+
if(_ircUser->idleTime().isValid()) {
QDateTime now = QDateTime::currentDateTime();
QDateTime idle = _ircUser->idleTime();
if(_ircUser->loginTime().isValid()) {
toolTip.append(tr("login time: %1").arg(_ircUser->loginTime().toString()));
}
-
+
if(!_ircUser->server().isEmpty()) toolTip.append(tr("server: %1").arg(_ircUser->server()));
}
toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));
if(isActive()) {
- //TODO: add channel modes
+ //TODO: add channel modes
toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
if(_ircChannel) {
QString channelMode = _ircChannel->channelModeString(); // channelModeString is compiled on the fly -> thus cache the result
if(!channelMode.isEmpty())
- toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
+ toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
}
-
+
BufferSettings s;
bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
if(showTopic) {
QString _topic = topic();
if(_topic != "") {
- _topic.replace(QString("<"), QString("<"));
- _topic.replace(QString(">"), QString(">"));
- toolTip.append(QString("<font size='-2'> </font>"));
- toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
+ _topic = stripFormatCodes(_topic);
+ _topic.replace(QString("<"), QString("<"));
+ _topic.replace(QString(">"), QString(">"));
+ toolTip.append(QString("<font size='-2'> </font>"));
+ toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
}
}
} else {
toolTip.append(tr("Not active <br /> Double-click to join"));
}
- return tr("<p> %1 </p>").arg(toolTip.join("<br />"));
+ return tr("<p> %1 </p>").arg(toolTip.join("<br />"));
}
void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) {
Q_ASSERT(!_ircChannel && ircChannel);
-
+
_ircChannel = ircChannel;
connect(ircChannel, SIGNAL(topicSet(QString)),
if(!ircChannel->ircUsers().isEmpty())
join(ircChannel->ircUsers());
-
+
emit dataChanged();
}
UserCategoryItem *ChannelBufferItem::findCategoryItem(int categoryId) {
UserCategoryItem *categoryItem = 0;
-
+
for(int i = 0; i < childCount(); i++) {
categoryItem = qobject_cast<UserCategoryItem *>(child(i));
if(!categoryItem)
int categoryId = -1;
UserCategoryItem *categoryItem = 0;
-
+
foreach(IrcUser *ircUser, ircUsers) {
categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
categoryItem = findCategoryItem(categoryId);
int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
UserCategoryItem *categoryItem = findCategoryItem(categoryId);
-
+
if(categoryItem) {
if(categoryItem->findIrcUser(ircUser)) {
return; // already in the right category;
: PropertyMapItem(QStringList() << "nickName", parent),
_ircUser(ircUser)
{
- setObjectName(ircUser->nick());
+ setObjectName(ircUser->nick());
connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
connect(ircUser, SIGNAL(nickSet(QString)), this, SIGNAL(dataChanged()));
connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
NetworkModel::NetworkModel(QObject *parent)
: TreeModel(NetworkModel::defaultHeader(), parent)
{
+ connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+ this, SLOT(checkForNewBuffers(const QModelIndex &, int, int)));
+ connect(this, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
+ this, SLOT(checkForRemovedBuffers(const QModelIndex &, int, int)));
}
QList<QVariant >NetworkModel::defaultHeader() {
return index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType;
}
-/*
-Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const {
- BufferItem *item = static_cast<BufferItem *>(index.internalPointer());
- return Client::instance()->buffer(item->id());
-}
-*/
-
int NetworkModel::networkRow(NetworkId networkId) {
NetworkItem *netItem = 0;
for(int i = 0; i < rootItem->childCount(); i++) {
}
QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
- BufferItem *bufferItem = findBufferItem(bufferId);
- if(bufferItem)
- return indexByItem(bufferItem);
- else
+ if(!_bufferItemCache.contains(bufferId))
return QModelIndex();
-}
-BufferItem *NetworkModel::findBufferItem(const BufferInfo &bufferInfo) {
- NetworkItem *netItem = findNetworkItem(bufferInfo.networkId());
- if(!netItem)
- return 0;
-
- BufferItem *bufferItem = netItem->findBufferItem(bufferInfo);
- return bufferItem;
+ return indexByItem(_bufferItemCache[bufferId]);
}
BufferItem *NetworkModel::findBufferItem(BufferId bufferId) {
- NetworkItem *netItem;
- BufferItem *bufferItem;
-
- for(int i = 0; i < rootItem->childCount(); i++) {
- netItem = qobject_cast<NetworkItem *>(rootItem->child(i));
- if((bufferItem = netItem->findBufferItem(bufferId)))
- return bufferItem;
- }
- return 0;
+ if(_bufferItemCache.contains(bufferId))
+ return _bufferItemCache[bufferId];
+ else
+ return 0;
}
BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) {
+ if(_bufferItemCache.contains(bufferInfo.bufferId()))
+ return _bufferItemCache[bufferInfo.bufferId()];
+
NetworkItem *netItem = networkItem(bufferInfo.networkId());
return netItem->bufferItem(bufferInfo);
}
// no self merges (would kill us)
if(bufferId == parent.data(BufferIdRole).value<BufferId>())
- return false;
+ return false;
NetworkItem *netItem = findNetworkItem(netId);
Q_ASSERT(netItem);
// source must be a query too
if(bufferItem->bufferType() != BufferInfo::QueryBuffer)
return false;
-
+
// TODO: warn user about buffermerge!
qDebug() << "merging" << bufferId << parent.data(BufferIdRole).value<BufferId>();
removeRow(parent.row(), parent.parent());
-
+
return true;
}
}
void NetworkModel::removeBuffer(BufferId bufferId) {
- BufferItem *bufferItem = findBufferItem(bufferId);
- if(bufferItem)
- bufferItem->parent()->removeChild(bufferItem);
+ BufferItem *buffItem = findBufferItem(bufferId);
+ if(!buffItem)
+ return;
+
+ buffItem->parent()->removeChild(buffItem);
}
-/*
-void NetworkModel::updateBufferActivity(const Message &msg) {
- BufferItem *buff = bufferItem(msg.bufferInfo());
- Q_ASSERT(buff);
+MsgId NetworkModel::lastSeenMsgId(BufferId bufferId) {
+ if(!_bufferItemCache.contains(bufferId))
+ return MsgId();
- buff->setLastMsgInsert(msg.timestamp());
+ return _bufferItemCache[bufferId]->lastSeenMsgId();
+}
- if(buff->lastSeen() >= msg.timestamp())
- return;
+MsgId NetworkModel::lastSeenMarkerMsgId(BufferId bufferId) {
+ if(!_bufferItemCache.contains(bufferId))
+ return MsgId();
- BufferItem::ActivityLevel level = BufferItem::OtherActivity;
- if(msg.type() == Message::Plain || msg.type() == Message::Notice)
- level |= BufferItem::NewMessage;
+ return _bufferItemCache[bufferId]->lastSeenMarkerMsgId();
+}
- if(msg.flags() & Message::Highlight)
- level |= BufferItem::Highlight;
+void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId) {
+ BufferItem *bufferItem = findBufferItem(bufferId);
+ if(!bufferItem) {
+ qDebug() << "NetworkModel::setLastSeenMsgId(): buffer is unknown:" << bufferId;
+ return;
+ }
+ bufferItem->setLastSeenMsgId(msgId);
+}
- bufferItem(msg.bufferInfo())->updateActivity(level);
+void NetworkModel::updateBufferActivity(const Message &msg) {
+ BufferItem *item = bufferItem(msg.bufferInfo());
+ item->updateActivityLevel(msg);
+ if(item->isCurrentBuffer())
+ emit setLastSeenMsg(item->bufferId(), msg.msgId());
}
-*/
-void NetworkModel::setBufferActivity(const BufferInfo &info, Buffer::ActivityLevel level) {
- BufferItem *buff = bufferItem(info);
- Q_ASSERT(buff);
+void NetworkModel::setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel level) {
+ BufferItem *bufferItem = findBufferItem(bufferId);
+ if(!bufferItem) {
+ qDebug() << "NetworkModel::setBufferActivity(): buffer is unknown:" << bufferId;
+ return;
+ }
+ bufferItem->setActivityLevel(level);
+}
- buff->setActivityLevel(level);
+void NetworkModel::clearBufferActivity(const BufferId &bufferId) {
+ BufferItem *bufferItem = findBufferItem(bufferId);
+ if(!bufferItem) {
+ qDebug() << "NetworkModel::clearBufferActivity(): buffer is unknown:" << bufferId;
+ return;
+ }
+ bufferItem->clearActivityLevel();
}
const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
return Client::network(networkId);
}
+void NetworkModel::checkForRemovedBuffers(const QModelIndex &parent, int start, int end) {
+ if(parent.data(ItemTypeRole) != NetworkItemType)
+ return;
+
+ for(int row = start; row <= end; row++) {
+ _bufferItemCache.remove(parent.child(row, 0).data(BufferIdRole).value<BufferId>());
+ }
+}
+
+void NetworkModel::checkForNewBuffers(const QModelIndex &parent, int start, int end) {
+ if(parent.data(ItemTypeRole) != NetworkItemType)
+ return;
+
+ for(int row = start; row <= end; row++) {
+ QModelIndex child = parent.child(row, 0);
+ _bufferItemCache[child.data(BufferIdRole).value<BufferId>()] = static_cast<BufferItem *>(child.internalPointer());
+ }
+}
+
+QString NetworkModel::bufferName(BufferId bufferId) {
+ if(!_bufferItemCache.contains(bufferId))
+ return QString();
+
+ return _bufferItemCache[bufferId]->bufferName();
+}
+
+BufferInfo::Type NetworkModel::bufferType(BufferId bufferId) {
+ if(!_bufferItemCache.contains(bufferId))
+ return BufferInfo::InvalidBuffer;
+
+ return _bufferItemCache[bufferId]->bufferType();
+}
+
+BufferInfo NetworkModel::bufferInfo(BufferId bufferId) {
+ if(!_bufferItemCache.contains(bufferId))
+ return BufferInfo();
+
+ return _bufferItemCache[bufferId]->bufferInfo();
+}
+
+NetworkId NetworkModel::networkId(BufferId bufferId) {
+ if(!_bufferItemCache.contains(bufferId))
+ return NetworkId();
+
+ NetworkItem *netItem = qobject_cast<NetworkItem *>(_bufferItemCache[bufferId]->parent());
+ if(netItem)
+ return netItem->networkId();
+ else
+ return NetworkId();
+}
+
+QString NetworkModel::networkName(BufferId bufferId) {
+ if(!_bufferItemCache.contains(bufferId))
+ return QString();
+
+ NetworkItem *netItem = qobject_cast<NetworkItem *>(_bufferItemCache[bufferId]->parent());
+ if(netItem)
+ return netItem->networkName();
+ else
+ return QString();
+}
projects / quassel.git / blobdiff