/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel Project *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
: PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
_networkId(netid)
{
+ // DO NOT EMIT dataChanged() DIRECTLY IN NetworkItem
+ // use networkDataChanged() instead. Otherwise you will end up in a infinite loop
+ // as we "sync" the dataChanged() signals of NetworkItem and StatusBufferItem
setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+ connect(this, SIGNAL(networkDataChanged(int)), this, SIGNAL(dataChanged(int)));
}
QVariant NetworkItem::data(int column, int role) const {
case NetworkModel::BufferIdRole:
case NetworkModel::BufferInfoRole:
case NetworkModel::BufferTypeRole:
+ case NetworkModel::BufferActivityRole:
if(childCount())
return child(0)->data(column, role);
else
switch(bufferInfo.type()) {
case BufferInfo::StatusBuffer:
bufferItem = new StatusBufferItem(bufferInfo, this);
+ disconnect(this, SIGNAL(networkDataChanged(int)), this, SIGNAL(dataChanged(int)));
+ connect(this, SIGNAL(networkDataChanged(int)), bufferItem, SIGNAL(dataChanged(int)));
+ connect(bufferItem, SIGNAL(dataChanged(int)), this, SIGNAL(dataChanged(int)));
break;
case BufferInfo::ChannelBuffer:
bufferItem = new ChannelBufferItem(bufferInfo, this);
connect(network, SIGNAL(ircUserAdded(IrcUser *)),
this, SLOT(attachIrcUser(IrcUser *)));
connect(network, SIGNAL(connectedSet(bool)),
- this, SIGNAL(dataChanged()));
+ this, SIGNAL(networkDataChanged()));
connect(network, SIGNAL(destroyed()),
- this, SIGNAL(dataChanged()));
+ this, SIGNAL(networkDataChanged()));
- emit dataChanged();
+ emit networkDataChanged();
}
void NetworkItem::attachIrcChannel(IrcChannel *ircChannel) {
continue;
if(queryItem->bufferName().toLower() == ircUser->nick().toLower()) {
- queryItem->attachIrcUser(ircUser);
+ queryItem->setIrcUser(ircUser);
break;
}
}
void NetworkItem::setNetworkName(const QString &networkName) {
Q_UNUSED(networkName);
- emit dataChanged(0);
+ emit networkDataChanged(0);
}
void NetworkItem::setCurrentServer(const QString &serverName) {
Q_UNUSED(serverName);
- emit dataChanged(1);
+ emit networkDataChanged(1);
}
StatusBufferItem::StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent)
: BufferItem(bufferInfo, parent)
{
- Q_ASSERT(parent);
- connect(parent, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
}
QString StatusBufferItem::toolTip(int column) const {
return;
IrcUser *ircUser = net->ircUser(bufferInfo.bufferName());
- if(ircUser)
- attachIrcUser(ircUser);
+ setIrcUser(ircUser);
}
QVariant QueryBufferItem::data(int column, int role) const {
}
}
+void QueryBufferItem::setBufferName(const QString &name) {
+ BufferItem::setBufferName(name);
+ NetworkId netId = data(0, NetworkModel::NetworkIdRole).value<NetworkId>();
+ const Network *net = Client::network(netId);
+ if(net)
+ setIrcUser(net->ircUser(name));
+}
+
QString QueryBufferItem::toolTip(int column) const {
// pretty much code duplication of IrcUserItem::toolTip() but inheritance won't solve this...
Q_UNUSED(column);
return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
}
-void QueryBufferItem::attachIrcUser(IrcUser *ircUser) {
+void QueryBufferItem::setIrcUser(IrcUser *ircUser) {
+ if(_ircUser == ircUser)
+ return;
+
+ if(_ircUser) {
+ disconnect(_ircUser, 0, this, 0);
+ }
+
+ if(ircUser) {
+ connect(ircUser, SIGNAL(quited()), this, SLOT(removeIrcUser()));
+ connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
+ }
+
_ircUser = ircUser;
- connect(_ircUser, SIGNAL(quited()), this, SLOT(ircUserQuited()));
- connect(_ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
emit dataChanged();
}
-void QueryBufferItem::ircUserQuited() {
+void QueryBufferItem::removeIrcUser() {
_ircUser = 0;
emit dataChanged();
}
: PropertyMapItem(QStringList() << "categoryName", parent),
_category(category)
{
+ setFlags(Qt::ItemIsEnabled);
setTreeItemFlags(AbstractTreeItem::DeleteOnLastChildRemoved);
setObjectName(parent->data(0, Qt::DisplayRole).toString() + "/" + QString::number(category));
}
}
return BufferId();
}
+
+void NetworkModel::sortBufferIds(QList<BufferId> &bufferIds) const {
+ QList<BufferItem *> bufferItems;
+ foreach(BufferId bufferId, bufferIds) {
+ if(_bufferItemCache.contains(bufferId))
+ bufferItems << _bufferItemCache[bufferId];
+ }
+
+ qSort(bufferItems.begin(), bufferItems.end(), bufferItemLessThan);
+
+ bufferIds.clear();
+ foreach(BufferItem *bufferItem, bufferItems) {
+ bufferIds << bufferItem->bufferId();
+ }
+}
+
+QList<BufferId> NetworkModel::allBufferIdsSorted() const {
+ QList<BufferId> bufferIds = allBufferIds();
+ sortBufferIds(bufferIds);
+ return bufferIds;
+}
+
+bool NetworkModel::bufferItemLessThan(const BufferItem *left, const BufferItem *right) {
+ int leftType = left->bufferType();
+ int rightType = right->bufferType();
+
+ if(leftType != rightType)
+ return leftType < rightType;
+ else
+ return QString::compare(left->bufferName(), right->bufferName(), Qt::CaseInsensitive) < 0;
+}
+