X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=94d90b8d2c7e825bb7edaf9668f24d8776c93b1a;hb=e0872cf3b3cdb8c52c5a52f32c3140143a29409d;hp=74598fa15bc39ac2175e7741cccf097da3f2b286;hpb=016e582df39899c1356e4023ebc5a4b28a2e57ee;p=quassel.git diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 74598fa1..94d90b8d 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -29,30 +29,30 @@ #include "ircchannel.h" #include "ircuser.h" +#include "buffersettings.h" + #include "util.h" // get rid of this (needed for isChannelName) +// #define PHONDEV + /***************************************** * Fancy Buffer Items *****************************************/ BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent), _bufferInfo(bufferInfo), - _activity(NoActivity) + _bufferName(bufferInfo.bufferName()), + _activity(Buffer::NoActivity) { - // determine BufferType - if(bufferInfo.bufferName().isEmpty()) - _type = StatusType; - else if(isChannelName(bufferInfo.bufferName())) - _type = ChannelType; - else - _type = QueryType; - Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled; - if(bufferType() == QueryType) + if(bufferType() == BufferInfo::QueryBuffer) flags |= Qt::ItemIsDropEnabled; - setFlags(flags); - _lastSeen = BufferSettings(bufferInfo.bufferId()).lastSeen(); + if(bufferType() == BufferInfo::StatusBuffer) { + NetworkItem *networkItem = qobject_cast(parent); + connect(networkItem, SIGNAL(dataChanged()), this, SIGNAL(dataChanged())); + } + setFlags(flags); } const BufferInfo &BufferItem::bufferInfo() const { @@ -64,32 +64,28 @@ quint64 BufferItem::id() const { } bool BufferItem::isStatusBuffer() const { - return bufferType() == StatusType; + return bufferType() == BufferInfo::StatusBuffer; } -BufferItem::Type BufferItem::bufferType() const { - return _type; +BufferInfo::Type BufferItem::bufferType() const { + return bufferInfo().type(); } bool BufferItem::isActive() const { - if(bufferType() == ChannelType) + if(bufferType() == BufferInfo::ChannelBuffer) return _ircChannel; else return qobject_cast(parent())->isActive(); } -BufferItem::ActivityLevel BufferItem::activity() const { - return _activity; -} - -bool BufferItem::setActivity(const ActivityLevel &level) { +bool BufferItem::setActivityLevel(Buffer::ActivityLevel level) { _activity = level; emit dataChanged(); return true; } -void BufferItem::updateActivity(const ActivityLevel &level) { - ActivityLevel oldActivity = _activity; +void BufferItem::updateActivityLevel(Buffer::ActivityLevel level) { + Buffer::ActivityLevel oldActivity = _activity; _activity |= level; if(oldActivity != _activity) emit dataChanged(); @@ -110,7 +106,7 @@ QVariant BufferItem::data(int column, int role) const { case NetworkModel::ItemActiveRole: return isActive(); case NetworkModel::BufferActivityRole: - return qVariantFromValue((int)activity()); + return (int)activityLevel(); default: return PropertyMapItem::data(column, role); } @@ -119,9 +115,7 @@ QVariant BufferItem::data(int column, int role) const { bool BufferItem::setData(int column, const QVariant &value, int role) { switch(role) { case NetworkModel::BufferActivityRole: - return setActivity((ActivityLevel)value.toInt()); - case NetworkModel::LastSeenRole: - return setLastSeen(); + return setActivityLevel((Buffer::ActivityLevel)value.toInt()); default: return PropertyMapItem::setData(column, value, role); } @@ -166,10 +160,18 @@ void BufferItem::ircChannelDestroyed() { } QString BufferItem::bufferName() const { - if(bufferType() == StatusType) + if(bufferType() == BufferInfo::StatusBuffer) return tr("Status Buffer"); else - return bufferInfo().bufferName(); + 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(), _bufferInfo.bufferName()); + emit dataChanged(0); } QString BufferItem::topic() const { @@ -237,7 +239,12 @@ void BufferItem::part(IrcUser *ircUser) { } void BufferItem::removeUserFromCategory(IrcUser *ircUser) { - Q_ASSERT(_ircChannel); + if(!_ircChannel) { + // If we parted the channel there might still be some ircUsers connected. + // in that case we just ignore the call + Q_ASSERT(childCount() == 0); + return; + } bool success = false; UserCategoryItem *categoryItem = 0; @@ -279,11 +286,57 @@ void BufferItem::userModeChanged(IrcUser *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(QString("Status buffer from %1").arg(netName)); + break; + } + case BufferInfo::ChannelBuffer: + toolTip.append(QString("

Channel %1

").arg(bufferName())); + if(isActive()) { + //TODO: add channel modes + toolTip.append(QString("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(QString("Topic: %1").arg(_topic)); + } + } + } else { + toolTip.append(QString("Not active
Double-click to join")); + } + break; + case BufferInfo::QueryBuffer: + toolTip.append(QString("Query with %1").arg(bufferName())); + if(topic() != "") toolTip.append(QString("Away Message: %1").arg(topic())); + break; + default: //this should not happen + toolTip.append(QString("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName())); + break; + } + + return QString("

%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; @@ -296,7 +349,7 @@ bool BufferItem::setLastSeen() { QDateTime BufferItem::lastSeen() { return _lastSeen; } - +*/ /***************************************** * Network Items *****************************************/ @@ -324,11 +377,6 @@ quint64 NetworkItem::id() const { return qHash(_networkId); } -void NetworkItem::setActive(bool connected) { - Q_UNUSED(connected); - emit dataChanged(); -} - bool NetworkItem::isActive() const { if(_network) return _network->isConnected(); @@ -370,7 +418,7 @@ void NetworkItem::attachNetwork(Network *network) { connect(network, SIGNAL(ircChannelAdded(QString)), this, SLOT(attachIrcChannel(QString))); connect(network, SIGNAL(connectedSet(bool)), - this, SLOT(setActive(bool))); + this, SIGNAL(dataChanged())); // FIXME: connect this and that... @@ -404,11 +452,26 @@ void NetworkItem::setCurrentServer(const QString &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("
")); +} + + /***************************************** * User Category Items (like @vh etc.) *****************************************/ // we hardcode this even though we have PREFIX in network... but that wouldn't help with mapping modes to // category strings anyway. +// TODO make this translateable depending on the number of users in a category +// -> we can't set the real string here, because tr() needs to get the actual number as second param +// -> tr("%n User(s)", n) needs to be used somewhere where we do know the user number n const QList UserCategoryItem::categories = QList() << UserCategoryItem::Category('q', tr("Owners")) << UserCategoryItem::Category('a', tr("Admins")) @@ -480,6 +543,8 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent) connect(ircUser, SIGNAL(nickSet(QString)), this, SLOT(setNick(QString))); + connect(ircUser, SIGNAL(awaySet(bool)), + this, SLOT(setAway(bool))); } QString IrcUserItem::nickName() const { @@ -563,6 +628,11 @@ void IrcUserItem::setNick(QString newNick) { emit dataChanged(0); } +void IrcUserItem::setAway(bool away) { + Q_UNUSED(away); + emit dataChanged(0); +} + /***************************************** * NetworkModel *****************************************/ @@ -705,8 +775,8 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in return false; // target must be a query - BufferItem::Type targetType = (BufferItem::Type)parent.data(NetworkModel::BufferTypeRole).toInt(); - if(targetType != BufferItem::QueryType) + BufferInfo::Type targetType = (BufferInfo::Type)parent.data(NetworkModel::BufferTypeRole).toInt(); + if(targetType != BufferInfo::QueryBuffer) return false; QList< QPair > bufferList = mimeDataToBufferList(data); @@ -726,8 +796,8 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in Q_ASSERT(rootItem->childById(qHash(netId))->childById(qHash(bufferId))); // source must be a query too - BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(qHash(netId))->childById(qHash(bufferId))->data(0, BufferTypeRole).toInt(); - if(sourceType != BufferItem::QueryType) + BufferInfo::Type sourceType = (BufferInfo::Type)rootItem->childById(qHash(netId))->childById(qHash(bufferId))->data(0, BufferTypeRole).toInt(); + if(sourceType != BufferInfo::QueryBuffer) return false; // TODO: warn user about buffermerge! @@ -748,6 +818,18 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) { emit dataChanged(itemindex, itemindex); } +void NetworkModel::removeBuffer(BufferId bufferId) { + const int numNetworks = rootItem->childCount(); + if(numNetworks == 0) + return; + + for(int i = 0; i < numNetworks; i++) { + if(rootItem->child(i)->removeChildById(qHash(bufferId))) + break; + } +} + +/* void NetworkModel::updateBufferActivity(const Message &msg) { BufferItem *buff = bufferItem(msg.bufferInfo()); Q_ASSERT(buff); @@ -766,6 +848,14 @@ void NetworkModel::updateBufferActivity(const Message &msg) { bufferItem(msg.bufferInfo())->updateActivity(level); } +*/ + +void NetworkModel::setBufferActivity(const BufferInfo &info, Buffer::ActivityLevel level) { + BufferItem *buff = bufferItem(info); + Q_ASSERT(buff); + + buff->setActivityLevel(level); +} const Network *NetworkModel::networkByIndex(const QModelIndex &index) const { QVariant netVariant = index.data(NetworkIdRole);