X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=b52ab3a2316f5e6960eace408ececc6064b0df94;hp=23e06422129bdf33e4c4f26caad7b23e454ca920;hb=ff87e964d7bd93f7a851d570c27b97943578a734;hpb=3e8c20eed6bdc729a3eac2946fad70b8e03c1d2a diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 23e06422..b52ab3a2 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -244,7 +244,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()); @@ -304,7 +303,7 @@ 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) @@ -317,6 +316,8 @@ QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *pare QVariant QueryBufferItem::data(int column, int role) const { switch(role) { + case NetworkModel::IrcUserRole: + return QVariant::fromValue(_ircUser); case NetworkModel::UserAwayRole: return (bool)_ircUser ? _ircUser->isAway() : false; default: @@ -324,6 +325,27 @@ 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); + } +} + QString QueryBufferItem::toolTip(int column) const { // pretty much code duplication of IrcUserItem::toolTip() but inheritance won't solve this... Q_UNUSED(column); @@ -361,12 +383,12 @@ QString QueryBufferItem::toolTip(int column) const { void QueryBufferItem::attachIrcUser(IrcUser *ircUser) { _ircUser = ircUser; - connect(_ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed())); + connect(_ircUser, SIGNAL(quited()), this, SLOT(ircUserQuited())); connect(_ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged())); emit dataChanged(); } -void QueryBufferItem::ircUserDestroyed() { +void QueryBufferItem::ircUserQuited() { _ircUser = 0; emit dataChanged(); } @@ -387,6 +409,15 @@ ChannelBufferItem::ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeI attachIrcChannel(ircChannel); } +QVariant ChannelBufferItem::data(int column, int role) const { + switch(role) { + case NetworkModel::IrcChannelRole: + return QVariant::fromValue(_ircChannel); + default: + return BufferItem::data(column, role); + } +} + QString ChannelBufferItem::toolTip(int column) const { Q_UNUSED(column); QStringList toolTip; @@ -431,8 +462,8 @@ void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) { this, SLOT(join(QList))); connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)), this, SLOT(part(IrcUser *))); - connect(ircChannel, SIGNAL(destroyed()), - this, SLOT(ircChannelDestroyed())); + connect(ircChannel, SIGNAL(parted()), + this, SLOT(ircChannelParted())); connect(ircChannel, SIGNAL(ircUserModesSet(IrcUser *, QString)), this, SLOT(userModeChanged(IrcUser *))); connect(ircChannel, SIGNAL(ircUserModeAdded(IrcUser *, QString)), @@ -446,7 +477,7 @@ void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) { emit dataChanged(); } -void ChannelBufferItem::ircChannelDestroyed() { +void ChannelBufferItem::ircChannelParted() { Q_CHECK_PTR(_ircChannel); disconnect(_ircChannel, 0, this, 0); _ircChannel = 0; @@ -577,6 +608,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)); } @@ -661,7 +693,7 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent) _ircUser(ircUser) { setObjectName(ircUser->nick()); - connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed())); + connect(ircUser, SIGNAL(quited()), this, SLOT(ircUserQuited())); connect(ircUser, SIGNAL(nickSet(QString)), this, SIGNAL(dataChanged())); connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged())); } @@ -678,6 +710,12 @@ 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 QVariant::fromValue(_ircUser.data()); + case NetworkModel::UserAwayRole: + return (bool)_ircUser ? _ircUser->isAway() : false; default: return PropertyMapItem::data(column, role); } @@ -714,12 +752,6 @@ QString IrcUserItem::toolTip(int column) const { return QString("

%1

").arg(toolTip.join("
")); } -// void IrcUserItem::ircUserDestroyed() { -// parent()->removeChild(this); -// if(parent()->childCount() == 0) -// parent()->parent()->removeChild(parent()); -// } - /***************************************** * NetworkModel *****************************************/ @@ -742,7 +774,7 @@ bool NetworkModel::isBufferIndex(const QModelIndex &index) const { return index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType; } -int NetworkModel::networkRow(NetworkId networkId) { +int NetworkModel::networkRow(NetworkId networkId) const { NetworkItem *netItem = 0; for(int i = 0; i < rootItem->childCount(); i++) { netItem = qobject_cast(rootItem->child(i)); @@ -762,7 +794,7 @@ QModelIndex NetworkModel::networkIndex(NetworkId networkId) { return indexByItem(qobject_cast(rootItem->child(netRow))); } -NetworkItem *NetworkModel::findNetworkItem(NetworkId networkId) { +NetworkItem *NetworkModel::findNetworkItem(NetworkId networkId) const { int netRow = networkRow(networkId); if(netRow == -1) return 0; @@ -794,7 +826,7 @@ QModelIndex NetworkModel::bufferIndex(BufferId bufferId) { return indexByItem(_bufferItemCache[bufferId]); } -BufferItem *NetworkModel::findBufferItem(BufferId bufferId) { +BufferItem *NetworkModel::findBufferItem(BufferId bufferId) const { if(_bufferItemCache.contains(bufferId)) return _bufferItemCache[bufferId]; else @@ -860,49 +892,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); @@ -922,14 +911,14 @@ void NetworkModel::removeBuffer(BufferId bufferId) { buffItem->parent()->removeChild(buffItem); } -MsgId NetworkModel::lastSeenMsgId(BufferId bufferId) { +MsgId NetworkModel::lastSeenMsgId(BufferId bufferId) const { if(!_bufferItemCache.contains(bufferId)) return MsgId(); return _bufferItemCache[bufferId]->lastSeenMsgId(); } -MsgId NetworkModel::lastSeenMarkerMsgId(BufferId bufferId) { +MsgId NetworkModel::lastSeenMarkerMsgId(BufferId bufferId) const { if(!_bufferItemCache.contains(bufferId)) return MsgId(); @@ -998,28 +987,28 @@ void NetworkModel::checkForNewBuffers(const QModelIndex &parent, int start, int } } -QString NetworkModel::bufferName(BufferId bufferId) { +QString NetworkModel::bufferName(BufferId bufferId) const { if(!_bufferItemCache.contains(bufferId)) return QString(); return _bufferItemCache[bufferId]->bufferName(); } -BufferInfo::Type NetworkModel::bufferType(BufferId bufferId) { +BufferInfo::Type NetworkModel::bufferType(BufferId bufferId) const { if(!_bufferItemCache.contains(bufferId)) return BufferInfo::InvalidBuffer; return _bufferItemCache[bufferId]->bufferType(); } -BufferInfo NetworkModel::bufferInfo(BufferId bufferId) { +BufferInfo NetworkModel::bufferInfo(BufferId bufferId) const { if(!_bufferItemCache.contains(bufferId)) return BufferInfo(); return _bufferItemCache[bufferId]->bufferInfo(); } -NetworkId NetworkModel::networkId(BufferId bufferId) { +NetworkId NetworkModel::networkId(BufferId bufferId) const { if(!_bufferItemCache.contains(bufferId)) return NetworkId(); @@ -1030,7 +1019,7 @@ NetworkId NetworkModel::networkId(BufferId bufferId) { return NetworkId(); } -QString NetworkModel::networkName(BufferId bufferId) { +QString NetworkModel::networkName(BufferId bufferId) const { if(!_bufferItemCache.contains(bufferId)) return QString(); @@ -1040,3 +1029,48 @@ QString NetworkModel::networkName(BufferId bufferId) { else return QString(); } + +BufferId NetworkModel::bufferId(NetworkId networkId, const QString &bufferName, Qt::CaseSensitivity cs) const { + const NetworkItem *netItem = findNetworkItem(networkId); + if(!netItem) + return BufferId(); + + for(int i = 0; i < netItem->childCount(); i++) { + BufferItem *bufferItem = qobject_cast(netItem->child(i)); + if(bufferItem && !bufferItem->bufferName().compare(bufferName, cs)) + return bufferItem->bufferId(); + } + 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; +} +