X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=1892ecc2beb2cf4f124886c793882bd1682a6740;hp=bd2d8a57f0f14508ff6502c5e6c03236b0b9a6c7;hb=6cd775d833522724e1df44ae48e0b8aaf3e63d55;hpb=70ed7f4b13ab21a9b3dcb61386b56ad324ed697d diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index bd2d8a57..1892ecc2 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -27,46 +27,121 @@ #include "signalproxy.h" #include "network.h" #include "ircchannel.h" -#include "ircuser.h" #include "buffersettings.h" #include "util.h" // get rid of this (needed for isChannelName) /***************************************** -* Fancy Buffer Items +* Network Items *****************************************/ -BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent) - : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent), - _bufferInfo(bufferInfo), - _bufferName(bufferInfo.bufferName()), - _activity(Buffer::NoActivity), - _ircChannel(0) +NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent) + : PropertyMapItem(QList() << "networkName" << "currentServer" << "nickCount", parent), + _networkId(netid) { - Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled; - if(bufferType() == BufferInfo::QueryBuffer) - flags |= Qt::ItemIsDropEnabled; + setFlags(Qt::ItemIsEnabled); +} - if(bufferType() == BufferInfo::StatusBuffer) { - NetworkItem *networkItem = qobject_cast(parent); - connect(networkItem, SIGNAL(dataChanged()), this, SIGNAL(dataChanged())); +QVariant NetworkItem::data(int column, int role) const { + switch(role) { + case NetworkModel::NetworkIdRole: + return qVariantFromValue(_networkId); + case NetworkModel::ItemTypeRole: + return NetworkModel::NetworkItemType; + case NetworkModel::ItemActiveRole: + return isActive(); + default: + return PropertyMapItem::data(column, role); } - setFlags(flags); } -quint64 BufferItem::id() const { - return qHash(bufferInfo().bufferId()); +BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) { + BufferItem *bufferItem = qobject_cast(childById(qHash(bufferInfo.bufferId()))); + if(bufferItem) + return bufferItem; + + switch(bufferInfo.type()) { + case BufferInfo::StatusBuffer: + bufferItem = new StatusBufferItem(bufferInfo, this); + break; + case BufferInfo::ChannelBuffer: + bufferItem = new ChannelBufferItem(bufferInfo, this); + break; + case BufferInfo::QueryBuffer: + bufferItem = new QueryBufferItem(bufferInfo, this); + break; + default: + bufferItem = new BufferItem(bufferInfo, this); + } + + newChild(bufferItem); + return bufferItem; } -// bool BufferItem::isStatusBuffer() const { -// return bufferType() == BufferInfo::StatusBuffer; -// } +void NetworkItem::attachNetwork(Network *network) { + if(!network) + return; + + _network = network; -bool BufferItem::isActive() const { - if(bufferType() == BufferInfo::ChannelBuffer) - return _ircChannel; - else - return qobject_cast(parent())->isActive(); + connect(network, SIGNAL(networkNameSet(QString)), + this, SLOT(setNetworkName(QString))); + connect(network, SIGNAL(currentServerSet(QString)), + this, SLOT(setCurrentServer(QString))); + connect(network, SIGNAL(ircChannelAdded(IrcChannel *)), + this, SLOT(attachIrcChannel(IrcChannel *))); + connect(network, SIGNAL(connectedSet(bool)), + this, SIGNAL(dataChanged())); + connect(network, SIGNAL(destroyed()), + this, SIGNAL(dataChanged())); + + emit dataChanged(); +} + +void NetworkItem::attachIrcChannel(IrcChannel *ircChannel) { + ChannelBufferItem *channelItem; + for(int i = 0; i < childCount(); i++) { + channelItem = qobject_cast(child(i)); + if(!channelItem) + continue; + + if(channelItem->bufferName().toLower() == ircChannel->name().toLower()) { + channelItem->attachIrcChannel(ircChannel); + break; + } + } +} + +void NetworkItem::setNetworkName(const QString &networkName) { + Q_UNUSED(networkName); + emit dataChanged(0); +} + +void NetworkItem::setCurrentServer(const QString &serverName) { + Q_UNUSED(serverName); + emit dataChanged(1); +} + + +QString NetworkItem::toolTip(int column) const { + Q_UNUSED(column); + + QStringList toolTip(QString("%1").arg(networkName())); + toolTip.append(QString("Server: %1").arg(currentServer())); + toolTip.append(QString("Users: %1").arg(nickCount())); + + return QString("

%1

").arg(toolTip.join("
")); +} + +/***************************************** +* Fancy Buffer Items +*****************************************/ +BufferItem::BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent) + : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent), + _bufferInfo(bufferInfo), + _activity(Buffer::NoActivity) +{ + setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled); } void BufferItem::setActivityLevel(Buffer::ActivityLevel level) { @@ -105,6 +180,7 @@ QVariant BufferItem::data(int column, int role) const { } bool BufferItem::setData(int column, const QVariant &value, int role) { + qDebug() << "BufferItem::setData(int column, const QVariant &value, int role):" << this << column << value << role; switch(role) { case NetworkModel::BufferActivityRole: setActivityLevel((Buffer::ActivityLevel)value.toInt()); @@ -115,10 +191,122 @@ bool BufferItem::setData(int column, const QVariant &value, int role) { return true; } +void BufferItem::setBufferName(const QString &name) { + _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name); + emit dataChanged(0); +} -void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { - if(!ircChannel) - return; +QString BufferItem::toolTip(int column) const { + Q_UNUSED(column); + return tr("

%1 - %2

").arg(bufferInfo().bufferId().toInt()).arg(bufferName()); +} + +/* +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; +} + +QDateTime BufferItem::lastSeen() { + return _lastSeen; +} +*/ + +/***************************************** +* StatusBufferItem +*****************************************/ +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 { + Q_UNUSED(column); + QStringList toolTip; + + QString netName = Client::network(bufferInfo().networkId())->networkName(); + toolTip.append(tr("Status buffer of %1").arg(netName)); + + return tr("

%1

").arg(toolTip.join("
")); +} + +/***************************************** +* QueryBufferItem +*****************************************/ +QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent) + : BufferItem(bufferInfo, parent) +{ + setFlags(flags() | Qt::ItemIsDropEnabled); +} + +QString QueryBufferItem::toolTip(int column) const { + Q_UNUSED(column); + QStringList toolTip; + + toolTip.append(tr("Query with %1").arg(bufferName())); + if(topic() != "") { + toolTip.append(tr("Away Message: %1").arg(topic())); + } + + return tr("

%1

").arg(toolTip.join("
")); +} + +/***************************************** +* ChannelBufferItem +*****************************************/ +ChannelBufferItem::ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent) + : BufferItem(bufferInfo, parent), + _ircChannel(0) +{ +} + +QString ChannelBufferItem::toolTip(int column) const { + Q_UNUSED(column); + QStringList toolTip; + + toolTip.append(tr("Channel %1").arg(bufferName())); + if(isActive()) { + //TODO: add channel modes + toolTip.append(tr("Users: %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("Mode: %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(" ")); + toolTip.append(tr("Topic: %1").arg(_topic)); + } + } + } else { + toolTip.append(tr("Not active
Double-click to join")); + } + + return tr("

%1

").arg(toolTip.join("
")); +} + +void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) { + Q_ASSERT(!_ircChannel && ircChannel); _ircChannel = ircChannel; @@ -145,7 +333,7 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { emit dataChanged(); } -void BufferItem::ircChannelDestroyed() { +void ChannelBufferItem::ircChannelDestroyed() { Q_CHECK_PTR(_ircChannel); disconnect(_ircChannel, 0, this, 0); _ircChannel = 0; @@ -153,48 +341,14 @@ void BufferItem::ircChannelDestroyed() { removeAllChilds(); } -QString BufferItem::bufferName() const { - if(bufferType() == BufferInfo::StatusBuffer) - return tr("Status Buffer"); - else - return _bufferName; -} - -void BufferItem::setBufferName(const QString &name) { - _bufferName = name; - // as long as we need those bufferInfos, we have to update that one aswell. - // pretty ugly though :/ - _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name); - emit dataChanged(0); -} - -QString BufferItem::topic() const { - if(_ircChannel) - return _ircChannel->topic(); - else - return QString(); -} - -void BufferItem::ircUserDestroyed() { +void ChannelBufferItem::ircUserDestroyed() { // PRIVATE IrcUser *ircUser = static_cast(sender()); removeUserFromCategory(ircUser); emit dataChanged(2); } -int BufferItem::nickCount() const { - if(_ircChannel) - return _ircChannel->ircUsers().count(); - else - return 0; -} - -void BufferItem::setTopic(const QString &topic) { - Q_UNUSED(topic); - emit dataChanged(1); -} - -void BufferItem::join(const QList &ircUsers) { +void ChannelBufferItem::join(const QList &ircUsers) { addUsersToCategory(ircUsers); foreach(IrcUser *ircUser, ircUsers) { @@ -206,18 +360,22 @@ void BufferItem::join(const QList &ircUsers) { emit dataChanged(2); } -void BufferItem::addUserToCategory(IrcUser *ircUser) { +void ChannelBufferItem::addUserToCategory(IrcUser *ircUser) { addUsersToCategory(QList() << ircUser); } -void BufferItem::addUsersToCategory(const QList &ircUsers) { +void ChannelBufferItem::addUsersToCategory(const QList &ircUsers) { Q_ASSERT(_ircChannel); QHash > categories; + + int categoryId = -1; + UserCategoryItem *categoryItem = 0; + foreach(IrcUser *ircUser, ircUsers) { - UserCategoryItem *categoryItem; - int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); - if(!(categoryItem = qobject_cast(childById(qHash(categoryId))))) { + categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); + categoryItem = qobject_cast(childById(qHash(categoryId))); + if(!categoryItem) { categoryItem = new UserCategoryItem(categoryId, this); categories[categoryItem] = QList(); newChild(categoryItem); @@ -232,9 +390,9 @@ void BufferItem::addUsersToCategory(const QList &ircUsers) { } } -void BufferItem::part(IrcUser *ircUser) { +void ChannelBufferItem::part(IrcUser *ircUser) { if(!ircUser) { - qWarning() << bufferName() << "BufferItem::part(): unknown User" << ircUser; + qWarning() << bufferName() << "ChannelBufferItem::part(): unknown User" << ircUser; return; } @@ -243,7 +401,7 @@ void BufferItem::part(IrcUser *ircUser) { emit dataChanged(2); } -void BufferItem::removeUserFromCategory(IrcUser *ircUser) { +void ChannelBufferItem::removeUserFromCategory(IrcUser *ircUser) { if(!_ircChannel) { // If we parted the channel there might still be some ircUsers connected. // in that case we just ignore the call @@ -251,224 +409,44 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) { return; } - bool success = false; UserCategoryItem *categoryItem = 0; for(int i = 0; i < childCount(); i++) { categoryItem = qobject_cast(child(i)); - if(success = categoryItem->removeUser(ircUser)) { + if(categoryItem->removeUser(ircUser)) { if(categoryItem->childCount() == 0) removeChild(i); break; } } - - if(!success) { - qDebug() << "didn't find User:" << ircUser << qHash(ircUser); - qDebug() << "==== Childlist for Item:" << this << id() << bufferName() << "===="; - for(int i = 0; i < childCount(); i++) { - categoryItem = qobject_cast(child(i)); - categoryItem->dumpChildList(); - } - qDebug() << "==== End Of Childlist for Item:" << this << id() << bufferName() << "===="; - } - Q_ASSERT(success); } -void BufferItem::userModeChanged(IrcUser *ircUser) { +void ChannelBufferItem::userModeChanged(IrcUser *ircUser) { Q_ASSERT(_ircChannel); - UserCategoryItem *categoryItem; int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); - if((categoryItem = qobject_cast(childById(qHash(categoryId)))) && categoryItem->childById(qHash(ircUser))) + UserCategoryItem *categoryItem = qobject_cast(childById(qHash(categoryId))); + + if(categoryItem && categoryItem->childById(qHash(ircUser))) return; // already in the right category; - - removeUserFromCategory(ircUser); - addUserToCategory(ircUser); -} -QString BufferItem::toolTip(int column) const { - Q_UNUSED(column); - QStringList toolTip; - - switch(bufferType()) { - case BufferInfo::StatusBuffer: { - QString netName = Client::network(bufferInfo().networkId())->networkName(); - toolTip.append(tr("Status buffer of %1").arg(netName)); + // find the item that needs reparenting + IrcUserItem *ircUserItem = 0; + for(int i = 0; i < childCount(); i++) { + UserCategoryItem *categoryItem = qobject_cast(child(i)); + IrcUserItem *userItem = qobject_cast(categoryItem->childById(qHash(ircUser))); + if(userItem) { + ircUserItem = userItem; break; } - case BufferInfo::ChannelBuffer: - toolTip.append(tr("Channel %1").arg(bufferName())); - if(isActive()) { - //TODO: add channel modes - toolTip.append(tr("Users: %1").arg(nickCount())); - - 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(" ")); - toolTip.append(tr("Topic: %1").arg(_topic)); - } - } - if(_ircChannel) { - QString channelMode = _ircChannel->channelModeString(); // channelModeString is compiled on the fly -> thus cache the result - if(!channelMode.isEmpty()) - toolTip.append(tr("Mode: %1").arg(channelMode)); - } - } else { - toolTip.append(tr("Not active
Double-click to join")); - } - break; - case BufferInfo::QueryBuffer: - toolTip.append(tr("Query with %1").arg(bufferName())); - if(topic() != "") toolTip.append(tr("Away Message: %1").arg(topic())); - break; - default: //this should not happen - toolTip.append(tr("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName())); - break; } - return tr("

%1

").arg(toolTip.join("
")); -} - -/* -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; -} - -QDateTime BufferItem::lastSeen() { - return _lastSeen; -} -*/ -/***************************************** -* Network Items -*****************************************/ -NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent) - : PropertyMapItem(QList() << "networkName" << "currentServer" << "nickCount", parent), - _networkId(netid) -{ - setFlags(Qt::ItemIsEnabled); -} - -QVariant NetworkItem::data(int column, int role) const { - switch(role) { - case NetworkModel::NetworkIdRole: - return qVariantFromValue(_networkId); - case NetworkModel::ItemTypeRole: - return NetworkModel::NetworkItemType; - case NetworkModel::ItemActiveRole: - return isActive(); - default: - return PropertyMapItem::data(column, role); - } -} - -quint64 NetworkItem::id() const { - return qHash(_networkId); -} - -bool NetworkItem::isActive() const { - if(_network) - return _network->isConnected(); - else - return false; -} - -QString NetworkItem::networkName() const { - if(_network) - return _network->networkName(); - else - return QString(); -} - -QString NetworkItem::currentServer() const { - if(_network) - return _network->currentServer(); - else - return QString(); -} - -int NetworkItem::nickCount() const { - if(_network) - return _network->ircUsers().count(); - else - return 0; -} - -void NetworkItem::attachNetwork(Network *network) { - if(!network) - return; - - _network = network; - - connect(network, SIGNAL(networkNameSet(QString)), - this, SLOT(setNetworkName(QString))); - connect(network, SIGNAL(currentServerSet(QString)), - this, SLOT(setCurrentServer(QString))); - connect(network, SIGNAL(ircChannelAdded(QString)), - this, SLOT(attachIrcChannel(QString))); - connect(network, SIGNAL(connectedSet(bool)), - this, SIGNAL(dataChanged())); - connect(network, SIGNAL(destroyed()), - this, SIGNAL(dataChanged())); - - emit dataChanged(); -} - -void NetworkItem::attachIrcChannel(const QString &channelName) { - IrcChannel *ircChannel = _network->ircChannel(channelName); - if(!ircChannel) { - qWarning() << "NetworkItem::attachIrcChannel(): unkown Channel" << channelName; + if(!ircUserItem) { + qWarning() << "ChannelBufferItem::userModeChanged(IrcUser *): unable to determine old category of" << ircUser; return; } - - BufferItem *bufferItem; - for(int i = 0; i < childCount(); i++) { - bufferItem = qobject_cast(child(i)); - if(bufferItem->bufferName().toLower() == ircChannel->name().toLower()) { - bufferItem->attachIrcChannel(ircChannel); - break; - } - } -} - -void NetworkItem::setNetworkName(const QString &networkName) { - Q_UNUSED(networkName); - emit dataChanged(0); -} - -void NetworkItem::setCurrentServer(const QString &serverName) { - Q_UNUSED(serverName); - emit dataChanged(1); -} - - -QString NetworkItem::toolTip(int column) const { - Q_UNUSED(column); - - QStringList toolTip(QString("%1").arg(networkName())); - toolTip.append(QString("Server: %1").arg(currentServer())); - toolTip.append(QString("Users: %1").arg(nickCount())); - - return QString("

%1

").arg(toolTip.join("
")); + ircUserItem->reParent(categoryItem); } - /***************************************** * User Category Items (like @vh etc.) *****************************************/ @@ -480,7 +458,6 @@ UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "categoryName", parent), _category(category) { - } // caching this makes no sense, since we display the user number dynamically @@ -505,10 +482,14 @@ void UserCategoryItem::addUsers(const QList &ircUsers) { foreach(IrcUser *ircUser, ircUsers) userItems << new IrcUserItem(ircUser, this); newChilds(userItems); + emit dataChanged(0); } bool UserCategoryItem::removeUser(IrcUser *ircUser) { - return removeChildById(qHash(ircUser)); + bool success = removeChildById(qHash(ircUser)); + if(success) + emit dataChanged(0); + return success; } int UserCategoryItem::categoryFromModes(const QString &modes) { @@ -570,14 +551,6 @@ bool IrcUserItem::isActive() const { return false; } -IrcUser *IrcUserItem::ircUser() { - return _ircUser; -} - -quint64 IrcUserItem::id() const { - return _id; -} - QVariant IrcUserItem::data(int column, int role) const { switch(role) { case NetworkModel::ItemActiveRole: @@ -599,8 +572,11 @@ QString IrcUserItem::toolTip(int column) const { Q_UNUSED(column); QStringList toolTip(QString("%1").arg(nickName())); if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes())); - if(_ircUser->isAway()) toolTip[0].append(" is away"); - if(!_ircUser->awayMessage().isEmpty()) toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage())); + if(_ircUser->isAway()) { + toolTip[0].append(" is away"); + if(!_ircUser->awayMessage().isEmpty()) + toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage())); + } if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName()); if(!_ircUser->ircOperator().isEmpty()) toolTip.append(QString("%1 %2").arg(nickName()).arg(_ircUser->ircOperator())); if(!_ircUser->suserHost().isEmpty()) toolTip.append(_ircUser->suserHost()); @@ -704,15 +680,8 @@ BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) { } BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) { - BufferItem *bufItem = existsBufferItem(bufferInfo); - if(bufItem == 0) { - NetworkItem *netItem = networkItem(bufferInfo.networkId()); - bufItem = new BufferItem(bufferInfo, netItem); - netItem->newChild(bufItem); - } - - Q_ASSERT(bufItem); - return bufItem; + NetworkItem *netItem = networkItem(bufferInfo.networkId()); + return netItem->bufferItem(bufferInfo); } QStringList NetworkModel::mimeTypes() const {