X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=2fad8d652e09a791024cce22293bf26be5eebf9a;hp=c75dd576041d8ef1c9ba0a201f8d7b852f505a99;hb=f029b6f8d31be1c0d4d7a2b74989bcb61e4d511b;hpb=c6fc5ae878a4f92b658c3da2861bcc7da9c2594f diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index c75dd576..2fad8d65 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * 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 * @@ -37,9 +37,14 @@ *****************************************/ NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent) : PropertyMapItem(QList() << "networkName" << "currentServer" << "nickCount", parent), - _networkId(netid) + _networkId(netid), + _statusBufferItem(0) { + // 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 { @@ -47,8 +52,9 @@ QVariant NetworkItem::data(int column, int role) const { case NetworkModel::BufferIdRole: case NetworkModel::BufferInfoRole: case NetworkModel::BufferTypeRole: - if(childCount()) - return child(0)->data(column, role); + case NetworkModel::BufferActivityRole: + if(_statusBufferItem) + return _statusBufferItem->data(column, role); else return QVariant(); case NetworkModel::NetworkIdRole: @@ -83,7 +89,11 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) { switch(bufferInfo.type()) { case BufferInfo::StatusBuffer: - bufferItem = new StatusBufferItem(bufferInfo, this); + _statusBufferItem = new StatusBufferItem(bufferInfo, this); + bufferItem = _statusBufferItem; + 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); @@ -114,11 +124,11 @@ void NetworkItem::attachNetwork(Network *network) { 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) { @@ -143,7 +153,7 @@ void NetworkItem::attachIrcUser(IrcUser *ircUser) { continue; if(queryItem->bufferName().toLower() == ircUser->nick().toLower()) { - queryItem->attachIrcUser(ircUser); + queryItem->setIrcUser(ircUser); break; } } @@ -151,12 +161,12 @@ void NetworkItem::attachIrcUser(IrcUser *ircUser) { 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); } @@ -174,6 +184,16 @@ QString NetworkItem::toolTip(int column) const { return QString("

%1

").arg(toolTip.join("
")); } +void NetworkItem::onBeginRemoveChilds(int start, int end) { + for(int i = start; i <= end; i++) { + StatusBufferItem *statusBufferItem = qobject_cast(child(i)); + if(statusBufferItem) { + _statusBufferItem = 0; + break; + } + } +} + /***************************************** * Fancy Buffer Items *****************************************/ @@ -244,7 +264,6 @@ 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((BufferInfo::ActivityLevel)value.toInt()); @@ -283,18 +302,14 @@ QString BufferItem::toolTip(int column) const { 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("
")); + NetworkItem *networkItem = qobject_cast(parent()); + if(networkItem) + return networkItem->toolTip(column); + else + return QString(); } /***************************************** @@ -304,21 +319,22 @@ QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *pare : BufferItem(bufferInfo, parent), _ircUser(0) { - setFlags(flags() | Qt::ItemIsDropEnabled); + setFlags(flags() | Qt::ItemIsDropEnabled | Qt::ItemIsEditable); const Network *net = Client::network(bufferInfo.networkId()); if(!net) return; IrcUser *ircUser = net->ircUser(bufferInfo.bufferName()); - if(ircUser) - attachIrcUser(ircUser); + setIrcUser(ircUser); } QVariant QueryBufferItem::data(int column, int role) const { switch(role) { + case Qt::EditRole: + return BufferItem::data(column, Qt::DisplayRole); case NetworkModel::IrcUserRole: - return _ircUser; + return QVariant::fromValue(_ircUser); case NetworkModel::UserAwayRole: return (bool)_ircUser ? _ircUser->isAway() : false; default: @@ -326,6 +342,35 @@ QVariant QueryBufferItem::data(int column, int role) const { } } +bool QueryBufferItem::setData(int column, const QVariant &value, int role) { + if(column != 0) + return BufferItem::setData(column, value, role); + + switch(role) { + case Qt::EditRole: + { + QString newName = value.toString(); + if(!newName.isEmpty()) { + Client::renameBuffer(bufferId(), newName); + return true; + } else { + return false; + } + } + break; + default: + return BufferItem::setData(column, value, role); + } +} + +void QueryBufferItem::setBufferName(const QString &name) { + BufferItem::setBufferName(name); + NetworkId netId = data(0, NetworkModel::NetworkIdRole).value(); + 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); @@ -361,14 +406,24 @@ QString QueryBufferItem::toolTip(int column) const { return QString("

%1

").arg(toolTip.join("
")); } -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(); } @@ -392,7 +447,7 @@ ChannelBufferItem::ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeI QVariant ChannelBufferItem::data(int column, int role) const { switch(role) { case NetworkModel::IrcChannelRole: - return _ircChannel; + return QVariant::fromValue(_ircChannel); default: return BufferItem::data(column, role); } @@ -588,6 +643,7 @@ UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "categoryName", parent), _category(category) { + setFlags(Qt::ItemIsEnabled); setTreeItemFlags(AbstractTreeItem::DeleteOnLastChildRemoved); setObjectName(parent->data(0, Qt::DisplayRole).toString() + "/" + QString::number(category)); } @@ -689,8 +745,10 @@ QVariant IrcUserItem::data(int column, int role) const { return parent()->data(column, role); case NetworkModel::BufferInfoRole: return parent()->data(column, role); + case NetworkModel::IrcChannelRole: + return parent()->data(column, role); case NetworkModel::IrcUserRole: - return _ircUser.data(); + return QVariant::fromValue(_ircUser.data()); case NetworkModel::UserAwayRole: return (bool)_ircUser ? _ircUser->isAway() : false; default: @@ -869,49 +927,6 @@ QMimeData *NetworkModel::mimeData(const QModelIndexList &indexes) const { return mimeData; } -bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) { - Q_UNUSED(action) - Q_UNUSED(row) - Q_UNUSED(column) - - if(!mimeContainsBufferList(data)) - return false; - - // target must be a query - BufferInfo::Type targetType = (BufferInfo::Type)parent.data(NetworkModel::BufferTypeRole).toInt(); - if(targetType != BufferInfo::QueryBuffer) - return false; - - QList< QPair > bufferList = mimeDataToBufferList(data); - - // exactly one buffer has to be dropped - if(bufferList.count() != 1) - return false; - - NetworkId netId = bufferList.first().first; - BufferId bufferId = bufferList.first().second; - - // no self merges (would kill us) - if(bufferId == parent.data(BufferIdRole).value()) - return false; - - NetworkItem *netItem = findNetworkItem(netId); - Q_ASSERT(netItem); - - BufferItem *bufferItem = netItem->findBufferItem(bufferId); - Q_ASSERT(bufferItem); - - // 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(); - removeRow(parent.row(), parent.parent()); - - return true; -} - void NetworkModel::attachNetwork(Network *net) { NetworkItem *netItem = networkItem(net->networkId()); netItem->attachNetwork(net); @@ -1062,3 +1077,35 @@ BufferId NetworkModel::bufferId(NetworkId networkId, const QString &bufferName, } return BufferId(); } + +void NetworkModel::sortBufferIds(QList &bufferIds) const { + QList 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 NetworkModel::allBufferIdsSorted() const { + QList 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; +} +