#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)
BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
: PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
_bufferInfo(bufferInfo),
- _activity(NoActivity)
+ _bufferName(bufferInfo.bufferName()),
+ _activity(Buffer::NoActivity),
+ _ircChannel(0)
{
- // 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();
-}
-
-const BufferInfo &BufferItem::bufferInfo() const {
- return _bufferInfo;
+ if(bufferType() == BufferInfo::StatusBuffer) {
+ NetworkItem *networkItem = qobject_cast<NetworkItem *>(parent);
+ connect(networkItem, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
+ }
+ setFlags(flags);
}
quint64 BufferItem::id() const {
return qHash(bufferInfo().bufferId());
}
-bool BufferItem::isStatusBuffer() const {
- return bufferType() == StatusType;
-}
-
-BufferItem::Type BufferItem::bufferType() const {
- return _type;
-}
+// bool BufferItem::isStatusBuffer() const {
+// return bufferType() == BufferInfo::StatusBuffer;
+// }
bool BufferItem::isActive() const {
- if(bufferType() == ChannelType)
+ if(bufferType() == BufferInfo::ChannelBuffer)
return _ircChannel;
else
return qobject_cast<NetworkItem *>(parent())->isActive();
}
-BufferItem::ActivityLevel BufferItem::activity() const {
- return _activity;
-}
-
-bool BufferItem::setActivity(const ActivityLevel &level) {
- _activity = level;
- emit dataChanged();
- return true;
+void BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
+ if(_activity != level) {
+ _activity = level;
+ emit dataChanged();
+ }
}
-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();
case NetworkModel::ItemActiveRole:
return isActive();
case NetworkModel::BufferActivityRole:
- return qVariantFromValue((int)activity());
+ return (int)activityLevel();
default:
return PropertyMapItem::data(column, role);
}
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();
+ setActivityLevel((Buffer::ActivityLevel)value.toInt());
+ return true;
default:
return PropertyMapItem::setData(column, value, role);
}
connect(ircChannel, SIGNAL(topicSet(QString)),
this, SLOT(setTopic(QString)));
- connect(ircChannel, SIGNAL(ircUserJoined(IrcUser *)),
- this, SLOT(join(IrcUser *)));
+ connect(ircChannel, SIGNAL(ircUsersJoined(QList<IrcUser *>)),
+ this, SLOT(join(QList<IrcUser *>)));
connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)),
this, SLOT(part(IrcUser *)));
connect(ircChannel, SIGNAL(destroyed()),
connect(ircChannel, SIGNAL(ircUserModeRemoved(IrcUser *, QString)),
this, SLOT(userModeChanged(IrcUser *)));
- if(!ircChannel->ircUsers().isEmpty()) {
- qWarning() << "Channel" << ircChannel->name() << "has already users which is quite surprising :)";
- foreach(IrcUser *ircUser, ircChannel->ircUsers()) {
- join(ircUser);
- }
- }
+ if(!ircChannel->ircUsers().isEmpty())
+ join(ircChannel->ircUsers());
emit dataChanged();
}
void BufferItem::ircChannelDestroyed() {
+ Q_CHECK_PTR(_ircChannel);
+ disconnect(_ircChannel, 0, this, 0);
+ _ircChannel = 0;
emit dataChanged();
removeAllChilds();
}
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(), name);
+ emit dataChanged(0);
}
QString BufferItem::topic() const {
emit dataChanged(1);
}
-void BufferItem::join(IrcUser *ircUser) {
- if(!ircUser)
- return;
+void BufferItem::join(const QList<IrcUser *> &ircUsers) {
+ addUsersToCategory(ircUsers);
- addUserToCategory(ircUser);
- connect(ircUser, SIGNAL(destroyed()),
- this, SLOT(ircUserDestroyed()));
+ foreach(IrcUser *ircUser, ircUsers) {
+ if(!ircUser)
+ continue;
+ connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
+ }
+
emit dataChanged(2);
}
void BufferItem::addUserToCategory(IrcUser *ircUser) {
+ addUsersToCategory(QList<IrcUser *>() << ircUser);
+}
+
+void BufferItem::addUsersToCategory(const QList<IrcUser *> &ircUsers) {
Q_ASSERT(_ircChannel);
- UserCategoryItem *categoryItem;
- int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
- if(!(categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId))))) {
- categoryItem = new UserCategoryItem(categoryId, this);
- newChild(categoryItem);
+ QHash<UserCategoryItem *, QList<IrcUser *> > categories;
+ foreach(IrcUser *ircUser, ircUsers) {
+ UserCategoryItem *categoryItem;
+ int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
+ if(!(categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId))))) {
+ categoryItem = new UserCategoryItem(categoryId, this);
+ categories[categoryItem] = QList<IrcUser *>();
+ newChild(categoryItem);
+ }
+ categories[categoryItem] << ircUser;
}
- categoryItem->addUser(ircUser);
- int totalusers = 0;
- for(int i = 0; i < childCount(); i++) {
- totalusers += child(i)->childCount();
+ QHash<UserCategoryItem *, QList<IrcUser *> >::const_iterator catIter = categories.constBegin();
+ while(catIter != categories.constEnd()) {
+ catIter.key()->addUsers(catIter.value());
+ catIter++;
}
}
}
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;
for(int i = 0; i < childCount(); i++) {
categoryItem = qobject_cast<UserCategoryItem *>(child(i));
- if(success = categoryItem->removeUser(ircUser)) {
+ if((success = categoryItem->removeUser(ircUser))) {
if(categoryItem->childCount() == 0)
removeChild(i);
break;
}
}
- if(!success) {
- qDebug() << "didn't find User:" << ircUser << (quint64)ircUser;
- qDebug() << "==== Childlist for Item:" << this << id() << bufferName() << "====";
- for(int i = 0; i < childCount(); i++) {
- categoryItem = qobject_cast<UserCategoryItem *>(child(i));
- categoryItem->dumpChildList();
- }
- qDebug() << "==== End Of Childlist for Item:" << this << id() << bufferName() << "====";
- }
- Q_ASSERT(success);
-
- int totalusers = 0;
- for(int i = 0; i < childCount(); i++) {
- totalusers += child(i)->childCount();
- }
+// 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<UserCategoryItem *>(child(i));
+// categoryItem->dumpChildList();
+// }
+// qDebug() << "==== End Of Childlist for Item:" << this << id() << bufferName() << "====";
+// }
+// Q_ASSERT(success);
}
void BufferItem::userModeChanged(IrcUser *ircUser) {
UserCategoryItem *categoryItem;
int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
- if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
+ if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && 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("<b>Status buffer of %1</b>").arg(netName));
+ break;
+ }
+ case BufferInfo::ChannelBuffer:
+ toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));
+ if(isActive()) {
+ //TODO: add channel modes
+ toolTip.append(tr("<b>Users:</b> %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("<font size='-2'> </font>"));
+ toolTip.append(tr("<b>Topic:</b> %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("<b>Mode:</b> %1").arg(channelMode));
+ }
+ } else {
+ toolTip.append(tr("Not active <br /> Double-click to join"));
+ }
+ break;
+ case BufferInfo::QueryBuffer:
+ toolTip.append(tr("<b>Query with %1</b>").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("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
+/*
void BufferItem::setLastMsgInsert(QDateTime msgDate) {
if(msgDate.isValid() && msgDate > _lastMsgInsert)
_lastMsgInsert = msgDate;
}
-
+*/
+/*
+// FIXME emit dataChanged()
bool BufferItem::setLastSeen() {
if(_lastSeen > _lastMsgInsert)
return false;
QDateTime BufferItem::lastSeen() {
return _lastSeen;
}
-
+*/
/*****************************************
* Network Items
*****************************************/
return qHash(_networkId);
}
-void NetworkItem::setActive(bool connected) {
- Q_UNUSED(connected);
- emit dataChanged();
-}
-
bool NetworkItem::isActive() const {
if(_network)
return _network->isConnected();
connect(network, SIGNAL(ircChannelAdded(QString)),
this, SLOT(attachIrcChannel(QString)));
connect(network, SIGNAL(connectedSet(bool)),
- this, SLOT(setActive(bool)));
+ this, SIGNAL(dataChanged()));
+ connect(network, SIGNAL(destroyed()),
+ this, SIGNAL(dataChanged()));
- // FIXME: connect this and that...
-
emit dataChanged();
}
BufferItem *bufferItem;
for(int i = 0; i < childCount(); i++) {
bufferItem = qobject_cast<BufferItem *>(child(i));
- if(bufferItem->bufferName() == ircChannel->name()) {
+ if(bufferItem->bufferName().toLower() == ircChannel->name().toLower()) {
bufferItem->attachIrcChannel(ircChannel);
break;
}
emit dataChanged(1);
}
+
+QString NetworkItem::toolTip(int column) const {
+ Q_UNUSED(column);
+
+ QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
+ toolTip.append(QString("Server: %1").arg(currentServer()));
+ toolTip.append(QString("Users: %1").arg(nickCount()));
+
+ return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
+
/*****************************************
* 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.
-const QList<UserCategoryItem::Category> UserCategoryItem::categories = QList<UserCategoryItem::Category>()
- << UserCategoryItem::Category('q', "Owners")
- << UserCategoryItem::Category('a', "Admins")
- << UserCategoryItem::Category('a', "Admins")
- << UserCategoryItem::Category('o', "Operators")
- << UserCategoryItem::Category('h', "Half-Ops")
- << UserCategoryItem::Category('v', "Voiced");
+const QList<QChar> UserCategoryItem::categories = QList<QChar>() << 'q' << 'a' << 'o' << 'h' << 'v';
UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
- : PropertyMapItem(QStringList() << "categoryId", parent),
+ : PropertyMapItem(QStringList() << "categoryName", parent),
_category(category)
{
+
}
-QString UserCategoryItem::categoryId() {
- if(_category < categories.count())
- return categories[_category].displayString;
- else
- return QString("Users");
+// caching this makes no sense, since we display the user number dynamically
+QString UserCategoryItem::categoryName() const {
+ int n = childCount();
+ switch(_category) {
+ case 0: return tr("%n Owner(s)", 0, n);
+ case 1: return tr("%n Admin(s)", 0, n);
+ case 2: return tr("%n Operator(s)", 0, n);
+ case 3: return tr("%n Half-Op(s)", 0, n);
+ case 4: return tr("%n Voiced", 0, n);
+ default: return tr("%n User(s)", 0, n);
+ }
}
quint64 UserCategoryItem::id() const {
return qHash(_category);
}
-void UserCategoryItem::addUser(IrcUser *ircUser) {
- newChild(new IrcUserItem(ircUser, this));
+void UserCategoryItem::addUsers(const QList<IrcUser *> &ircUsers) {
+ QList<AbstractTreeItem *> userItems;
+ foreach(IrcUser *ircUser, ircUsers)
+ userItems << new IrcUserItem(ircUser, this);
+ newChilds(userItems);
}
bool UserCategoryItem::removeUser(IrcUser *ircUser) {
- return removeChildById((quint64)ircUser);
+ return removeChildById(qHash(ircUser));
}
int UserCategoryItem::categoryFromModes(const QString &modes) {
for(int i = 0; i < categories.count(); i++) {
- if(modes.contains(categories[i].mode))
+ if(modes.contains(categories[i]))
return i;
}
return categories.count();
QVariant UserCategoryItem::data(int column, int role) const {
switch(role) {
+ case TreeModel::SortRole:
+ return _category;
case NetworkModel::ItemActiveRole:
return true;
case NetworkModel::ItemTypeRole:
}
}
-
+
/*****************************************
* Irc User Items
*****************************************/
connect(ircUser, SIGNAL(nickSet(QString)),
this, SLOT(setNick(QString)));
+ connect(ircUser, SIGNAL(awaySet(bool)),
+ this, SLOT(setAway(bool)));
}
QString IrcUserItem::nickName() 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:
QString IrcUserItem::toolTip(int column) const {
Q_UNUSED(column);
QStringList toolTip(QString("<b>%1</b>").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->realName().isEmpty()) toolTip.append(_ircUser->realName());
- if(!_ircUser->ircOperator().isEmpty()) toolTip.append(_ircUser->ircOperator());
- toolTip.append(_ircUser->hostmask());
+ if(!_ircUser->ircOperator().isEmpty()) toolTip.append(QString("%1 %2").arg(nickName()).arg(_ircUser->ircOperator()));
+ if(!_ircUser->suserHost().isEmpty()) toolTip.append(_ircUser->suserHost());
+ if(!_ircUser->whoisServiceReply().isEmpty()) toolTip.append(_ircUser->whoisServiceReply());
+
+ toolTip.append(_ircUser->hostmask().remove(0, _ircUser->hostmask().indexOf("!")+1));
if(_ircUser->idleTime().isValid()) {
QDateTime now = QDateTime::currentDateTime();
QDateTime idle = _ircUser->idleTime();
int idleTime = idle.secsTo(now);
-
- QList< QPair<int, QString> > timeUnit;
- timeUnit.append(qMakePair(365*60*60, tr("year")));
- timeUnit.append(qMakePair(24*60*60, tr("day")));
- timeUnit.append(qMakePair(60*60, tr("h")));
- timeUnit.append(qMakePair(60, tr("min")));
- timeUnit.append(qMakePair(1, tr("sec")));
-
- QString idleString(' ');
- for(int i=0; i < timeUnit.size(); i++) {
- int n = idleTime / timeUnit[i].first;
- if(n > 0) {
- idleString += QString("%1 %2 ").arg(QString::number(n), timeUnit[i].second);
- }
- idleTime = idleTime % timeUnit[i].first;
- }
- toolTip.append(QString("idling since %1").arg(idleString));
+ toolTip.append(tr("idling since %1").arg(secondsToString(idleTime)));
+ }
+ if(_ircUser->loginTime().isValid()) {
+ toolTip.append(tr("login time: %1").arg(_ircUser->loginTime().toString()));
}
- if(!_ircUser->server().isEmpty()) toolTip.append(QString("server: %1").arg(_ircUser->server()));
+ if(!_ircUser->server().isEmpty()) toolTip.append(tr("server: %1").arg(_ircUser->server()));
return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
}
emit dataChanged(0);
}
+void IrcUserItem::setAway(bool away) {
+ Q_UNUSED(away);
+ emit dataChanged(0);
+}
+
/*****************************************
* NetworkModel
*****************************************/
// experimental stuff :)
QModelIndex NetworkModel::networkIndex(NetworkId networkId) {
- return indexById(networkId.toInt());
+ return indexById(qHash(networkId));
}
NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) {
return netItem;
}
+void NetworkModel::networkRemoved(const NetworkId &networkId) {
+ rootItem->removeChildById(qHash(networkId));
+}
+
QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
AbstractTreeItem *netItem, *bufferItem;
for(int i = 0; i < rootItem->childCount(); i++) {
netItem = rootItem->child(i);
- if((bufferItem = netItem->childById(bufferId.toInt()))) {
- return indexById(bufferItem->id(), networkIndex(netItem->id()));
+ if((bufferItem = netItem->childById(qHash(bufferId)))) {
+ return indexByItem(bufferItem);
}
}
return QModelIndex();
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<NetworkId, BufferId> > bufferList = mimeDataToBufferList(data);
if(bufferId == parent.data(BufferIdRole).value<BufferId>())
return false;
- Q_ASSERT(rootItem->childById(netId.toInt()));
- Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt()));
+ Q_ASSERT(rootItem->childById(qHash(netId)));
+ Q_ASSERT(rootItem->childById(qHash(netId))->childById(qHash(bufferId)));
// source must be a query too
- BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId.toInt())->childById(bufferId.toInt())->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!
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);
if(msg.type() == Message::Plain || msg.type() == Message::Notice)
level |= BufferItem::NewMessage;
- const Network *net = Client::network(msg.bufferInfo().networkId());
- if(net && (msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) && msg.text().contains(net->myNick()))
- level |= BufferItem::Highlight;
+ if(msg.flags() & Message::Highlight)
+ level |= BufferItem::Highlight;
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);
NetworkId networkId = netVariant.value<NetworkId>();
return Client::network(networkId);
}
+
projects / quassel.git / blobdiff