_activity(NoActivity)
{
// determine BufferType
- if(bufferInfo.buffer().isEmpty())
+ if(bufferInfo.bufferName().isEmpty())
_type = StatusType;
- else if(isChannelName(bufferInfo.buffer()))
+ else if(isChannelName(bufferInfo.bufferName()))
_type = ChannelType;
else
_type = QueryType;
}
quint64 BufferItem::id() const {
- return bufferInfo().uid().toInt();
+ return bufferInfo().bufferId().toInt();
}
bool BufferItem::isStatusBuffer() const {
void BufferItem::setActivity(const ActivityLevel &level) {
_activity = level;
+ emit dataChanged();
}
-void BufferItem::addActivity(const ActivityLevel &level) {
+void BufferItem::updateActivity(const ActivityLevel &level) {
_activity |= level;
+ emit dataChanged();
}
QVariant BufferItem::data(int column, int role) const {
case NetworkModel::ItemTypeRole:
return NetworkModel::BufferItemType;
case NetworkModel::BufferIdRole:
- return qVariantFromValue(bufferInfo().uid());
+ return qVariantFromValue(bufferInfo().bufferId());
case NetworkModel::NetworkIdRole:
return qVariantFromValue(bufferInfo().networkId());
+ case NetworkModel::BufferInfoRole:
+ return qVariantFromValue(bufferInfo());
case NetworkModel::BufferTypeRole:
return int(bufferType());
case NetworkModel::ItemActiveRole:
return isActive();
+ case NetworkModel::BufferActivityRole:
+ return qVariantFromValue((int)activity());
default:
return PropertyMapItem::data(column, role);
}
}
+bool BufferItem::setData(int column, const QVariant &value, int role) {
+ switch(role) {
+ case NetworkModel::BufferActivityRole:
+ setActivity((ActivityLevel)value.toInt());
+ default:
+ return PropertyMapItem::setData(column, value, role);
+ }
+ return true;
+}
+
+
void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
if(!ircChannel)
return;
this, SLOT(userModeChanged(IrcUser *)));
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);
+ }
+ }
emit dataChanged();
}
if(bufferType() == StatusType)
return tr("Status Buffer");
else
- return bufferInfo().buffer();
+ return bufferInfo().bufferName();
}
QString BufferItem::topic() const {
void BufferItem::addUserToCategory(IrcUser *ircUser) {
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);
- emit newChild(categoryItem);
+ newChild(categoryItem);
}
-
categoryItem->addUser(ircUser);
+
+ int totalusers = 0;
+ for(int i = 0; i < childCount(); i++) {
+ totalusers += child(i)->childCount();
+ }
}
void BufferItem::part(IrcUser *ircUser) {
- Q_UNUSED(ircUser);
+ if(!ircUser) {
+ qWarning() << bufferName() << "BufferItem::part(): unknown User" << ircUser;
+ return;
+ }
+
+ removeUserFromCategory(ircUser);
emit dataChanged(2);
}
void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
+ Q_ASSERT(_ircChannel);
+
+ bool success = false;
UserCategoryItem *categoryItem = 0;
- IrcUserItem *userItem;
for(int i = 0; i < childCount(); i++) {
categoryItem = qobject_cast<UserCategoryItem *>(child(i));
- if((userItem = qobject_cast<IrcUserItem *>(categoryItem->childById((quint64)ircUser)))) {
- userItem->deleteLater();
- return;
+ 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();
+ }
}
void BufferItem::userModeChanged(IrcUser *ircUser) {
Q_ASSERT(_ircChannel);
-
+
UserCategoryItem *categoryItem;
int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
- if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))))
+ if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
return; // already in the right category;
removeUserFromCategory(ircUser);
return _networkId.toInt();
}
+void NetworkItem::setActive(bool connected) {
+ Q_UNUSED(connected);
+ emit dataChanged();
+}
+
bool NetworkItem::isActive() const {
- return _network;
+ if(_network)
+ return _network->isConnected();
+ else
+ return false;
}
QString NetworkItem::networkName() const {
this, SLOT(setCurrentServer(QString)));
connect(network, SIGNAL(ircChannelAdded(QString)),
this, SLOT(attachIrcChannel(QString)));
+ connect(network, SIGNAL(connectedSet(bool)),
+ this, SLOT(setActive(bool)));
+
// FIXME: connect this and that...
emit dataChanged();
*****************************************/
// 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<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");
UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
: PropertyMapItem(QStringList() << "categoryId", parent),
_category(category)
{
- connect(this, SIGNAL(childRemoved(int)),
- this, SLOT(checkNoChilds()));
}
QString UserCategoryItem::categoryId() {
return QString("Users");
}
-void UserCategoryItem::checkNoChilds() {
- if(childCount() == 0)
- deleteLater();
-}
-
quint64 UserCategoryItem::id() const {
return qHash(_category);
}
void UserCategoryItem::addUser(IrcUser *ircUser) {
- emit newChild(new IrcUserItem(ircUser, this));
+ newChild(new IrcUserItem(ircUser, this));
+}
+
+bool UserCategoryItem::removeUser(IrcUser *ircUser) {
+ return removeChildById((quint64)ircUser);
}
int UserCategoryItem::categoryFromModes(const QString &modes) {
}
return categories.count();
}
+
+QVariant UserCategoryItem::data(int column, int role) const {
+ switch(role) {
+ case NetworkModel::ItemActiveRole:
+ return true;
+ case NetworkModel::ItemTypeRole:
+ return NetworkModel::UserCategoryItemType;
+ case NetworkModel::BufferIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::NetworkIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::BufferInfoRole:
+ return parent()->data(column, role);
+ default:
+ return PropertyMapItem::data(column, role);
+ }
+}
+
/*****************************************
* Irc User Items
: PropertyMapItem(QStringList() << "nickName", parent),
_ircUser(ircUser)
{
- connect(ircUser, SIGNAL(destroyed()),
- this, SLOT(ircUserDestroyed()));
+ // we don't need to handle the ircUser's destroyed signal since it's automatically removed
+ // by the IrcChannel::ircUserParted();
connect(ircUser, SIGNAL(nickSet(QString)),
this, SLOT(setNick(QString)));
}
-QString IrcUserItem::nickName() {
+QString IrcUserItem::nickName() const {
return _ircUser->nick();
}
return (quint64)_ircUser;
}
+QVariant IrcUserItem::data(int column, int role) const {
+ switch(role) {
+ case NetworkModel::ItemActiveRole:
+ return !_ircUser->isAway();
+ case NetworkModel::ItemTypeRole:
+ return NetworkModel::IrcUserItemType;
+ case NetworkModel::BufferIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::NetworkIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::BufferInfoRole:
+ return parent()->data(column, role);
+ default:
+ return PropertyMapItem::data(column, role);
+ }
+}
+
+QString IrcUserItem::toolTip(int column) const {
+ Q_UNUSED(column);
+ QStringList toolTip(QString("<b>%1</b>").arg(nickName()));
+ 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->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));
+ }
+
+ if(!_ircUser->server().isEmpty()) toolTip.append(QString("server: %1").arg(_ircUser->server()));
+
+ return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
void IrcUserItem::setNick(QString newNick) {
Q_UNUSED(newNick);
emit dataChanged(0);
}
-void IrcUserItem::ircUserDestroyed() {
- deleteLater();
-}
/*****************************************
* NetworkModel
if(netItem == 0) {
netItem = new NetworkItem(networkId, rootItem);
- appendChild(rootItem, netItem);
+ rootItem->newChild(netItem);
}
Q_ASSERT(netItem);
}
BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
- QModelIndex bufferIdx = bufferIndex(bufferInfo.uid());
+ QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId());
if(bufferIdx.isValid())
return static_cast<BufferItem *>(bufferIdx.internalPointer());
else
if(bufItem == 0) {
NetworkItem *netItem = networkItem(bufferInfo.networkId());
bufItem = new BufferItem(bufferInfo, netItem);
- appendChild(netItem, bufItem);
+ netItem->newChild(bufItem);
}
Q_ASSERT(bufItem);
emit dataChanged(itemindex, itemindex);
}
-void NetworkModel::bufferActivity(BufferItem::ActivityLevel level, BufferInfo bufferInfo) {
-// BufferItem *bufferItem = buffer(buf->bufferInfo());
-// if(!bufferItem) {
-// qWarning() << "NetworkModel::bufferActivity(): received Activity Info for uknown Buffer";
-// return;
-// }
-// bufferItem->setActivity(level);
-// bufferUpdated(buf);
+void NetworkModel::updateBufferActivity(const Message &msg) {
+ BufferItem::ActivityLevel level = BufferItem::OtherActivity;
+ if(msg.type() == Message::Plain || msg.type() == Message::Notice)
+ level |= BufferItem::NewMessage;
+
+ const Network *net = Client::network(msg.bufferInfo().networkId());
+ if(net && msg.text().contains(net->myNick()))
+ level |= BufferItem::Highlight;
+
+ bufferItem(msg.bufferInfo())->updateActivity(level);
}
+const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
+ QVariant netVariant = index.data(NetworkIdRole);
+ if(!netVariant.isValid())
+ return 0;
+
+ NetworkId networkId = netVariant.value<NetworkId>();
+ return Client::network(networkId);
+}
projects / quassel.git / blobdiff